[MPlayer-cvslog] r32114 - in trunk: gui/interface.c gui/win32/dialogs.c mplayer.h

[diego]

Author: diego
Date: Thu Sep  9 17:41:43 2010
New Revision: 32114

Log:
Move **sub_name extern declaration to mplayer.h, where it belongs.

Modified:
   trunk/gui/interface.c
   trunk/gui/win32/dialogs.c
   trunk/mplayer.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Sep  9 17:39:10 2010	(r32113)
+++ trunk/gui/interface.c	Thu Sep  9 17:41:43 2010	(r32114)
@@ -398,8 +398,6 @@ void guiLoadFont( void )
 #endif
 }
 
-extern char **sub_name;
-
 void guiLoadSubtitle( char * name )
 {
  if ( guiIntfStruct.Playing == 0 )

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Thu Sep  9 17:39:10 2010	(r32113)
+++ trunk/gui/win32/dialogs.c	Thu Sep  9 17:41:43 2010	(r32114)
@@ -27,6 +27,7 @@
 #include "gui/interface.h"
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "mplayer.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
@@ -46,8 +47,6 @@ int get_video_colors(sh_video_t *sh_vide
 guiInterface_t guiIntfStruct;
 int addurl = 0;
 
-extern char **sub_name;
-
 void guiLoadSubtitle(char *name)
 {
     if (!guiIntfStruct.Playing)

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Thu Sep  9 17:39:10 2010	(r32113)
+++ trunk/mplayer.h	Thu Sep  9 17:41:43 2010	(r32114)
@@ -37,7 +37,6 @@ extern char * sub_font_name;
 extern float  font_factor;
 extern double force_fps;
 
-//extern char **sub_name;
 extern int    sub_auto;
 
 extern char * filename;
@@ -47,6 +46,8 @@ extern int autosync;
 extern double start_pts;
 extern int frame_dropping;
 
+/* for the GUI */
+extern char **sub_name;
 extern int auto_quality;
 
 extern int audio_id;