[MPlayer-dev-eng] [PATCH] libmpdemux/cddb.c on bsdi

Steven M. Schultz sms at 2BSD.COM
Fri Nov 25 02:16:21 CET 2005


Hi -

	I'm probably the only person who builds MPlayer on a BSDi system ;)

	When it comes to CD/DVD handling bsdi has a linux CD/DVD compatibility
	library (that's the "-ldvd" and "include dvd.h" used for DVD reading).

	The small attached patch fixes the building of MPlayer for this 
	(weird ;)) system.

	Cheers,
	Steven Schultz
-------------- next part --------------
--- libmpdemux/cddb.c.dist	Thu Nov 24 17:05:39 2005
+++ libmpdemux/cddb.c	Thu Nov 24 17:07:13 2005
@@ -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;


More information about the MPlayer-dev-eng mailing list