[Mplayer-cvslog] CVS: main/libmpdemux cdda.c,1.7,1.8

[Bertrand Baudet]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv11496

Modified Files:
	cdda.c 
Log Message:
Removed the hardcoded /dev/cdrom for NetBSD and added an work around
for problem with cdparanoia.
Patch from Frederick Bruckman <fredb at immanent.net>


Index: cdda.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cdda.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cdda.c	28 Dec 2002 14:04:54 -0000	1.7
+++ cdda.c	15 Jan 2003 17:50:21 -0000	1.8
@@ -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");