[MPlayer-cvslog] r24169 - in trunk: gui/cfg.c gui/interface.c gui/mplayer/gtk/opts.c mplayer.h

[diego]

Author: diego
Date: Sat Aug 25 14:25:34 2007
New Revision: 24169

Log:
Remove redundant extern variable declarations, include proper headers instead.


Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/mplayer.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	(original)
+++ trunk/gui/cfg.c	Sat Aug 25 14:25:34 2007
@@ -10,8 +10,10 @@
 #include "mplayer.h"
 #include "m_config.h"
 #include "m_option.h"
-
+#include "libvo/sub.h"
 #include "libvo/video_out.h"
+#include "stream/stream.h"
+#include "libmpdemux/demuxer.h"
 
 #include "cfg.h"
 #include "app.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	(original)
+++ trunk/gui/interface.c	Sat Aug 25 14:25:34 2007
@@ -15,12 +15,10 @@
 #include "mplayer/gmplayer.h"
 #include "mplayer/play.h"
 
-#include "mplayer.h"
 #include "access_mpcontext.h"
 #include "app.h"
 #include "cfg.h"
 #include "help_mp.h"
-#include "subreader.h"
 #include "libvo/x11_common.h"
 #include "libvo/video_out.h"
 #include "libvo/font_load.h"

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	(original)
+++ trunk/gui/mplayer/gtk/opts.c	Sat Aug 25 14:25:34 2007
@@ -12,6 +12,7 @@
 #include "help_mp.h"
 #include "mixer.h"
 #include "libao2/audio_out.h"
+#include "libvo/sub.h"
 #include "libvo/video_out.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	(original)
+++ trunk/mplayer.h	Sat Aug 25 14:25:34 2007
@@ -28,16 +28,10 @@ extern float force_fps;
 extern float  sub_delay;
 extern float  sub_fps;
 extern int    sub_auto;
-extern int    sub_pos;
-extern int    sub_unicode;
-extern char * sub_cp;
-extern int    suboverlap_enabled;
 
 extern char * filename;
 
 extern int stream_cache_size;
-extern int force_ni;
-extern int index_mode;
 extern int autosync;
 
 // libmpcodecs: