[MPlayer-dev-eng] [PATCH] cddb://

[Frederick Bruckman]

On Tue, 14 Jan 2003, Bertrand Baudet wrote:

> I finally made the patch to get rid of the hardcoded cdrom device.
>
> It works for linux but I have no idea if it broke something
> on the *BSD systems.
>
> Please people with FreeBSD, OpenBSD and NetBSD
> test and report.

Works for me on NetBSD. In the same spirit, here's a patch to remove
the hardcoded device in cdda.c (on NetBSD), that I introduced in an
earlier submission.

Frederick
-------------- next part --------------
Index: libmpdemux/cdda.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cdda.c,v
retrieving revision 1.7
diff -u -r1.7 cdda.c
--- libmpdemux/cdda.c	28 Dec 2002 14:04:54 -0000	1.7
+++ libmpdemux/cdda.c	15 Jan 2003 01:02:19 -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;
@@ -69,6 +65,10 @@
     }
   }
     
+#if defined(__NetBSD__)
+  generic_dev = dev;
+#endif
+
   if(generic_dev)
     cdd = cdda_identify_scsi(generic_dev,dev,0,NULL);
   else