fix compilation when dvdkit and dvdread are not available

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17192 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 17 insertions, 5 deletions

diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 01deaa3f72..62e65e6c97 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -31,7 +31,6 @@ SRCS += cdda.c \
 
 # Stream readers/writers
 SRCS += stream.c \
-        stream_dvd.c \
         stream_file.c \
         stream_ftp.c \
         stream_livedotcom.c \
@@ -89,6 +88,9 @@ SRCS += demuxer.c \
         demux_vqf.c \
         demux_y4m.c \
 
+ifeq ($(HAVE_DVD),yes)
+SRCS += stream_dvd.c
+endif 
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 9d813d63f7..5fcfa5b508 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -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)
 
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 84babf0ed5..4eebbbc485 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -75,7 +75,9 @@ extern stream_info_t stream_info_rtsp_sip;
 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_t* auto_open_streams[] = {
   &stream_info_smb,
 #endif
   &stream_info_cue,
+#ifdef HAVE_DVD
   &stream_info_dvd,
+#endif
 #ifdef USE_DVDNAV
   &stream_info_dvdnav;
 #endif
diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c
index eb0048b5a2..c5793ffd96 100644
--- a/libmpdemux/stream_dvd.c
+++ b/libmpdemux/stream_dvd.c
@@ -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_info_t stream_info_dvd = {
   &stream_opts,
   1 // Urls are an option string
 };
+#endif