[MPlayer-cvslog] r31500 - in trunk/stream: stream.h stream_dvd_common.h

[diego]

Author: diego
Date: Mon Jun 21 10:58:09 2010
New Revision: 31500

Log:
Move dvd_device extern declaration from stream_dvd_common.h to stream.h.
All the other variables from open.c are declared in stream.h.

Modified:
   trunk/stream/stream.h
   trunk/stream/stream_dvd_common.h

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Mon Jun 21 10:38:23 2010	(r31499)
+++ trunk/stream/stream.h	Mon Jun 21 10:58:09 2010	(r31500)
@@ -337,6 +337,7 @@ extern int vcd_track;
 
 extern char * audio_stream;
 extern char *cdrom_device;
+extern char *dvd_device;
 
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	Mon Jun 21 10:38:23 2010	(r31499)
+++ trunk/stream/stream_dvd_common.h	Mon Jun 21 10:58:09 2010	(r31500)
@@ -23,7 +23,6 @@
 #include <inttypes.h>
 #include <dvdread/ifo_types.h>
 
-extern char *dvd_device;
 extern const char * const dvd_audio_stream_channels[6];
 extern const char * const dvd_audio_stream_types[8];