changeset 8958:56bf90cefb10

Removed the hardcoded /dev/cdrom for NetBSD and added an work around for problem with cdparanoia. Patch from Frederick Bruckman <fredb@immanent.net>
author bertrand
date Wed, 15 Jan 2003 17:50:21 +0000
parents 36a5cdca733b
children 106f6f651467
files libmpdemux/cdda.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/cdda.c	Wed Jan 15 11:16:33 2003 +0000
+++ b/libmpdemux/cdda.c	Wed Jan 15 17:50:21 2003 +0000
@@ -12,11 +12,7 @@
 
 static int speed = -1;
 static int paranoia_mode = 1;
-#if defined(__NetBSD__)
-static char* generic_dev = "/dev/cdrom";
-#else
 static char* generic_dev = NULL;
-#endif
 static int sector_size = 0;
 static int search_overlap = -1;
 static int toc_bias = 0;
@@ -72,7 +68,11 @@
   if(generic_dev)
     cdd = cdda_identify_scsi(generic_dev,dev,0,NULL);
   else
+#if defined(__NetBSD__)
+    cdd = cdda_identify_scsi(dev,dev,0,NULL);
+#else
     cdd = cdda_identify(dev,0,NULL);
+#endif
 
   if(!cdd) {
     mp_msg(MSGT_OPEN,MSGL_ERR,"Can't open cdda device\n");