[MPlayer-cvslog] r31591 - in trunk: cfg-common.h stream/stream.h stream/stream_dvd_common.h

[diego]

Author: diego
Date: Wed Jun 30 12:09:19 2010
New Revision: 31591

Log:
Move dvd_speed extern variable declaration from stream_dvd_common.h to stream.h.

All other dvd_ extern variable declarations are there already and this avoids
#ifdefs around an #include of stream_dvd_common.h in cfg-common.h, which would
be necessary because stream_dvd_common.h contains dvdread #includes.

Modified:
   trunk/cfg-common.h
   trunk/stream/stream.h
   trunk/stream/stream_dvd_common.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Wed Jun 30 11:55:14 2010	(r31590)
+++ trunk/cfg-common.h	Wed Jun 30 12:09:19 2010	(r31591)
@@ -39,7 +39,6 @@
 #include "stream/network.h"
 #include "stream/pvr.h"
 #include "stream/stream.h"
-#include "stream/stream_dvd_common.h"
 #include "stream/stream_radio.h"
 #include "stream/tcp.h"
 #include "stream/tv.h"

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Wed Jun 30 11:55:14 2010	(r31590)
+++ trunk/stream/stream.h	Wed Jun 30 12:09:19 2010	(r31591)
@@ -330,6 +330,7 @@ void stream_set_interrupt_callback(int (
 /// wait for time milliseconds
 int stream_check_interrupt(int time);
 
+extern int dvd_speed;
 extern int dvd_title;
 extern int dvd_chapter;
 extern int dvd_last_chapter;

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	Wed Jun 30 11:55:14 2010	(r31590)
+++ trunk/stream/stream_dvd_common.h	Wed Jun 30 12:09:19 2010	(r31591)
@@ -26,7 +26,6 @@
 extern const char * const dvd_audio_stream_channels[6];
 extern const char * const dvd_audio_stream_types[8];
 
-extern int dvd_speed;
 void dvd_set_speed(char *device, unsigned speed);
 int mp_dvdtimetomsec(dvd_time_t *dt);