[MPlayer-cvslog] CVS: main/libmpdemux Makefile, 1.97, 1.98 stream.c, 1.83, 1.84 open.c, 1.110, 1.111 stream_dvd.c, 1.7, 1.8

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	Makefile stream.c open.c stream_dvd.c 
Log Message:
fix compilation when dvdkit and dvdread are not available

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Makefile	23 Sep 2005 22:35:04 -0000	1.97
+++ Makefile	14 Dec 2005 21:52:41 -0000	1.98
@@ -31,7 +31,6 @@
 
 # Stream readers/writers
 SRCS += stream.c \
-        stream_dvd.c \
         stream_file.c \
         stream_ftp.c \
         stream_livedotcom.c \
@@ -89,6 +88,9 @@
         demux_vqf.c \
         demux_y4m.c \
 
+ifeq ($(HAVE_DVD),yes)
+SRCS += stream_dvd.c
+endif 
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- stream.c	18 Nov 2005 14:39:20 -0000	1.83
+++ stream.c	14 Dec 2005 21:52:41 -0000	1.84
@@ -75,7 +75,9 @@
 extern stream_info_t stream_info_cue;
 extern stream_info_t stream_info_null;
 extern stream_info_t stream_info_file;
+#ifdef HAVE_DVD
 extern stream_info_t stream_info_dvd;
+#endif
 
 stream_info_t* auto_open_streams[] = {
 #ifdef HAVE_VCD
@@ -110,7 +112,9 @@
   &stream_info_smb,
 #endif
   &stream_info_cue,
+#ifdef HAVE_DVD
   &stream_info_dvd,
+#endif
 #ifdef USE_DVDNAV
   &stream_info_dvdnav;
 #endif

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- open.c	18 Nov 2005 14:39:19 -0000	1.110
+++ open.c	14 Dec 2005 21:52:41 -0000	1.111
@@ -24,6 +24,10 @@
 /// We keep these 2 for the gui atm, but they will be removed.
 int vcd_track=0;
 char* cdrom_device=NULL;
+int dvd_chapter=1;
+int dvd_last_chapter=0;
+char* dvd_device=NULL;
+int dvd_title=0;
 
 // Open a new stream  (stdin/file/vcd/url)
 

Index: stream_dvd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_dvd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stream_dvd.c	18 Nov 2005 14:39:20 -0000	1.7
+++ stream_dvd.c	14 Dec 2005 21:52:41 -0000	1.8
@@ -26,12 +26,13 @@
 #include "m_struct.h"
 
 /// We keep these 2 for the gui atm, but they will be removed.
-int dvd_title=0;
-int dvd_chapter=1;
-int dvd_last_chapter=0;
+extern int dvd_title;
+extern int dvd_chapter;
+extern int dvd_last_chapter;
+extern char* dvd_device;
 int dvd_angle=1;
-char* dvd_device=NULL;
 
+#ifdef HAVE_DVD
 #ifdef USE_DVDREAD
 #define	DVDREAD_VERSION(maj,min,micro)	((maj)*10000 + (min)*100 + (micro))
 /*
@@ -792,3 +793,4 @@
   &stream_opts,
   1 // Urls are an option string
 };
+#endif