[MPlayer-cvslog] r32127 - in trunk: gui/cfg.c gui/mplayer/gtk/gtk_menu.c gui/mplayer/mw.c libmenu/vf_menu.c libmpdemux/demuxer.c libvo/font_load_ft.c libvo/sub.c mpcommon.h mplayer.h

[diego]

Author: diego
Date: Thu Sep  9 20:52:56 2010
New Revision: 32127

Log:
Move extern declarations used by both mplayer.c and mencoder.c to mpcommon.h.

Modified:
   trunk/gui/cfg.c
   trunk/gui/mplayer/gtk/gtk_menu.c
   trunk/gui/mplayer/mw.c
   trunk/libmenu/vf_menu.c
   trunk/libmpdemux/demuxer.c
   trunk/libvo/font_load_ft.c
   trunk/libvo/sub.c
   trunk/mpcommon.h
   trunk/mplayer.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/gui/cfg.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -24,6 +24,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mixer.h"
+#include "mpcommon.h"
 #include "mplayer.h"
 #include "m_config.h"
 #include "m_option.h"

Modified: trunk/gui/mplayer/gtk/gtk_menu.c
==============================================================================
--- trunk/gui/mplayer/gtk/gtk_menu.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/gui/mplayer/gtk/gtk_menu.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -24,6 +24,7 @@
 #include "help_mp.h"
 #include "access_mpcontext.h"
 #include "mixer.h"
+#include "mpcommon.h"
 
 #include "gtk_menu.h"
 #include "gui/mplayer/widgets.h"

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/gui/mplayer/mw.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -49,6 +49,7 @@
 #include "m_option.h"
 #include "m_property.h"
 #include "mp_core.h"
+#include "mpcommon.h"
 
 #define GUI_REDRAW_WAIT 375
 

Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/libmenu/vf_menu.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mplayer.h"
+#include "mpcommon.h"
 #include "mp_msg.h"
 
 #include "libmpcodecs/img_format.h"

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/libmpdemux/demuxer.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -30,7 +30,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "m_config.h"
-#include "mplayer.h"
+#include "mpcommon.h"
 
 #include "libvo/fastmemcpy.h"
 

Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/libvo/font_load_ft.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -47,7 +47,7 @@
 #include "font_load.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "mplayer.h"
+#include "mpcommon.h"
 #include "path.h"
 #include "osd_font.h"
 

Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/libvo/sub.c	Thu Sep  9 20:52:56 2010	(r32127)
@@ -32,7 +32,7 @@
 #include "libmpcodecs/dec_teletext.h"
 #include "osdep/timer.h"
 
-#include "mplayer.h"
+#include "mpcommon.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "video_out.h"

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/mpcommon.h	Thu Sep  9 20:52:56 2010	(r32127)
@@ -29,12 +29,22 @@ extern double sub_last_pts;
 extern ASS_Track *ass_track;
 extern subtitle *vo_sub_last;
 
+extern int sub_auto;
 extern float sub_delay;
 extern float sub_fps;
 extern char **sub_name;
+extern char  *font_name;
+extern char  *sub_font_name;
+extern float  font_factor;
+extern double force_fps;
 
 extern int disable_system_conf;
 extern int disable_user_conf;
+extern int stream_cache_size;
+extern int audio_id;
+extern int video_id;
+extern int dvdsub_id;
+extern int vobsub_id;
 
 extern const char *mencoder_version;
 extern const char *mplayer_version;

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Thu Sep  9 20:40:30 2010	(r32126)
+++ trunk/mplayer.h	Thu Sep  9 20:52:56 2010	(r32127)
@@ -30,16 +30,8 @@ extern float  audio_delay;
 extern int osd_level;
 extern unsigned int osd_visible;
 
-extern char * font_name;
-extern char * sub_font_name;
-extern float  font_factor;
-extern double force_fps;
-
-extern int    sub_auto;
-
 extern char * filename;
 
-extern int stream_cache_size;
 extern int use_menu;
 extern int autosync;
 extern double start_pts;
@@ -49,11 +41,6 @@ extern int frame_dropping;
 extern int auto_quality;
 extern int stream_dump_type;
 
-extern int audio_id;
-extern int video_id;
-extern int dvdsub_id;
-extern int vobsub_id;
-
 void update_set_of_subtitles(void);
 
 #endif /* MPLAYER_MPLAYER_H */