[MPlayer-cvslog] r31492 - in trunk: cfg-common.h gui/interface.c gui/win32/interface.c stream/stream.h

[diego]

Author: diego
Date: Sun Jun 20 17:53:45 2010
New Revision: 31492

Log:
Add declarations for open.c externally used variables to stream.h.

Modified:
   trunk/cfg-common.h
   trunk/gui/interface.c
   trunk/gui/win32/interface.c
   trunk/stream/stream.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 17:43:45 2010	(r31491)
+++ trunk/cfg-common.h	Sun Jun 20 17:53:45 2010	(r31492)
@@ -174,8 +174,6 @@ const m_option_t scaler_filter_conf[]={
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern char *cdrom_device;
-
 const m_option_t vivoopts_conf[]={
     {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
     /* audio options */

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jun 20 17:43:45 2010	(r31491)
+++ trunk/gui/interface.c	Sun Jun 20 17:53:45 2010	(r31492)
@@ -355,7 +355,6 @@ void guiDone( void )
 }
 
 extern int              stream_dump_type;
-extern int  		vcd_track;
 
 void guiLoadFont( void )
 {

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sun Jun 20 17:43:45 2010	(r31491)
+++ trunk/gui/win32/interface.c	Sun Jun 20 17:53:45 2010	(r31492)
@@ -49,7 +49,6 @@
 #include <cdio/cdio.h>
 #endif
 
-extern int vcd_track;
 int guiWinID = 0;
 
 char *skinName = NULL;

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Sun Jun 20 17:43:45 2010	(r31491)
+++ trunk/stream/stream.h	Sun Jun 20 17:53:45 2010	(r31492)
@@ -333,8 +333,10 @@ extern int dvd_title;
 extern int dvd_chapter;
 extern int dvd_last_chapter;
 extern int dvd_angle;
+extern int vcd_track;
 
 extern char * audio_stream;
+extern char *cdrom_device;
 
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm