[MPlayer-cvslog] CVS: main/libmpdemux cddb.c,1.21,1.22

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv17884/libmpdemux

Modified Files:
	cddb.c 
Log Message:
When it comes to CD/DVD handling bsdi has a linux CD/DVD compatibility
library, use this to fix building on this (weird ;)) system.
patch by Steven M. Schultz sms __ at __ 2BSD __ dot __ COM


Index: cddb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cddb.c	18 Nov 2005 14:39:18 -0000	1.21
+++ cddb.c	25 Nov 2005 02:06:47 -0000	1.22
@@ -41,10 +41,12 @@
 
 #if defined(__linux__)
 	#include <linux/cdrom.h>
-#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 	#include <sys/cdio.h>
 #elif defined(WIN32)
         #include <ddk/ntddcdrm.h>
+#elif (__bsdi__)
+        #include <dvd.h>
 #endif
 
 #include "cdd.h"
@@ -60,7 +62,7 @@
 static cd_toc_t cdtoc[100];
 static int cdtoc_last_track;
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__bsdi__)
 int 
 read_toc(const char *dev) {
 	int drive;
@@ -131,7 +133,7 @@
         return toc.LastTrack;
 }
 
-#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 int 
 read_toc(const char *dev) {
 	int drive;