[MPlayer-cvslog] r31555 - in trunk: find_sub.c gui/mplayer/gtk/fs.c gui/mplayer/gtk/opts.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c mpcommon.h mplayer.h subreader.c

[diego]

Author: diego
Date: Thu Jun 24 19:19:49 2010
New Revision: 31555

Log:
Clean up sub-related extern declarations.
- Move sub_delay and sub_fps declarations to mpcommon.h.
- Remove redundant ass_track extern declaration.
- Add #include for sub_utf8 extern declaration.

Modified:
   trunk/find_sub.c
   trunk/gui/mplayer/gtk/fs.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/libmpcodecs/vf_ass.c
   trunk/libmpcodecs/vf_vo.c
   trunk/mpcommon.h
   trunk/mplayer.h
   trunk/subreader.c

Modified: trunk/find_sub.c
==============================================================================
--- trunk/find_sub.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/find_sub.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -37,8 +37,6 @@ static int nosub_range_start=-1;
 static int nosub_range_end=-1;
 static const sub_data *last_sub_data = NULL;
 
-extern float sub_delay;
-extern float  sub_fps;
 
 void step_sub(sub_data *subd, float pts, int movement) {
     subtitle *subs;

Modified: trunk/gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/gui/mplayer/gtk/fs.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/gui/mplayer/gtk/fs.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -33,6 +33,7 @@
 #include "gui/app.h"
 #include "gui/interface.h"
 #include "help_mp.h"
+#include "mpcommon.h"
 #include "stream/stream.h"
 
 #include "gui/mplayer/widgets.h"

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/gui/mplayer/gtk/opts.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "help_mp.h"
 #include "mixer.h"
+#include "mpcommon.h"
 #include "libao2/audio_out.h"
 #include "libvo/sub.h"
 #include "libvo/video_out.h"

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/libmpcodecs/vf_ass.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-
+#include "mpcommon.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vd.h"
@@ -68,8 +68,6 @@ static const struct vf_priv_s {
 	unsigned char* dirty_rows;
 } vf_priv_dflt;
 
-extern ass_track_t* ass_track;
-extern float sub_delay;
 
 static int config(struct vf_instance *vf,
 	int width, int height, int d_width, int d_height,

Modified: trunk/libmpcodecs/vf_vo.c
==============================================================================
--- trunk/libmpcodecs/vf_vo.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/libmpcodecs/vf_vo.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
-
+#include "mpcommon.h"
 #include "mp_image.h"
 #include "vf.h"
 
@@ -31,13 +31,10 @@
 
 #ifdef CONFIG_ASS
 #include "libass/ass_mp.h"
-extern ass_track_t* ass_track;
 #endif
 
 //===========================================================================//
 
-extern float sub_delay;
-
 struct vf_priv_s {
     double pts;
     const vo_functions_t *vo;

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/mpcommon.h	Thu Jun 24 19:19:49 2010	(r31555)
@@ -29,6 +29,9 @@ extern double sub_last_pts;
 extern ass_track_t *ass_track;
 extern subtitle *vo_sub_last;
 
+extern float sub_delay;
+extern float sub_fps;
+
 extern const m_option_t noconfig_opts[];
 
 void print_version(const char* name);

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/mplayer.h	Thu Jun 24 19:19:49 2010	(r31555)
@@ -38,8 +38,6 @@ extern float  font_factor;
 extern double force_fps;
 
 //extern char **sub_name;
-extern float  sub_delay;
-extern float  sub_fps;
 extern int    sub_auto;
 
 extern char * filename;

Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c	Thu Jun 24 18:50:47 2010	(r31554)
+++ trunk/subreader.c	Thu Jun 24 19:19:49 2010	(r31555)
@@ -31,7 +31,9 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "mpcommon.h"
 #include "subreader.h"
+#include "libvo/sub.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"
@@ -1085,12 +1087,8 @@ static int sub_autodetect (stream_t* st,
     return SUB_INVALID;  // too many bad lines
 }
 
-extern int sub_utf8;
 int sub_utf8_prev=0;
 
-extern float sub_delay;
-extern float sub_fps;
-
 #ifdef CONFIG_ICONV
 static iconv_t icdsc = (iconv_t)(-1);