Mercurial > mplayer.hg

changeset 32043:f6249bc89c38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move extern declarations used by both mplayer.c and mencoder.c to mpcommon.h.
author diego
date Thu, 09 Sep 2010 18:52:56 +0000
parents 6af75b23e4ab
children 8108f92eddd9
files 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
diffstat 9 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/gui/cfg.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/gui/cfg.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
--- a/gui/mplayer/gtk/gtk_menu.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/gui/mplayer/gtk/gtk_menu.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
--- a/gui/mplayer/mw.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/gui/mplayer/mw.c	Thu Sep 09 18:52:56 2010 +0000
@@ -49,6 +49,7 @@
 #include "m_option.h"
 #include "m_property.h"
 #include "mp_core.h"
+#include "mpcommon.h"
 
 #define GUI_REDRAW_WAIT 375
 
--- a/libmenu/vf_menu.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/libmenu/vf_menu.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
--- a/libmpdemux/demuxer.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/libmpdemux/demuxer.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
 
--- a/libvo/font_load_ft.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/libvo/font_load_ft.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
 
--- a/libvo/sub.c	Thu Sep 09 18:40:30 2010 +0000
+++ b/libvo/sub.c	Thu Sep 09 18:52:56 2010 +0000
@@ -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"
--- a/mpcommon.h	Thu Sep 09 18:40:30 2010 +0000
+++ b/mpcommon.h	Thu Sep 09 18:52:56 2010 +0000
@@ -29,12 +29,22 @@
 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;
--- a/mplayer.h	Thu Sep 09 18:40:30 2010 +0000
+++ b/mplayer.h	Thu Sep 09 18:52:56 2010 +0000
@@ -30,16 +30,8 @@
 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 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 */