Mercurial > mplayer.hg
changeset 31385:f2aebe1309b2
Declare stop_xscreensaver extern in x11_common.h instead of all over the code.
| author | diego |
|---|---|
| date | Thu, 17 Jun 2010 09:46:44 +0000 |
| parents | ec5f9f87e77b |
| children | 2c34afe8f37f |
| files | cfg-mplayer.h gui/cfg.c gui/mplayer/gtk/opts.c libvo/x11_common.h |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Thu Jun 17 09:40:18 2010 +0000 +++ b/cfg-mplayer.h Thu Jun 17 09:46:44 2010 +0000 @@ -31,10 +31,9 @@ #include "libvo/geometry.h" #include "libvo/vo_fbdev.h" #include "libvo/vo_zr.h" +#include "libvo/x11_common.h" #include "mp_fifo.h" -extern int stop_xscreensaver; - extern char *unrar_executable; extern const m_option_t dxr2_opts[];
--- a/gui/cfg.c Thu Jun 17 09:40:18 2010 +0000 +++ b/gui/cfg.c Thu Jun 17 09:46:44 2010 +0000 @@ -31,6 +31,7 @@ #include "libmpcodecs/vd.h" #include "libvo/sub.h" #include "libvo/video_out.h" +#include "libvo/x11_common.h" #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libass/ass_mp.h" @@ -99,7 +100,6 @@ #endif // --- -extern int stop_xscreensaver; extern int disable_gui_conf; int m_config_parse_config_file(m_config_t* config, char *conffile);
--- a/gui/mplayer/gtk/opts.c Thu Jun 17 09:40:18 2010 +0000 +++ b/gui/mplayer/gtk/opts.c Thu Jun 17 09:46:44 2010 +0000 @@ -31,6 +31,7 @@ #include "libao2/audio_out.h" #include "libvo/sub.h" #include "libvo/video_out.h" +#include "libvo/x11_common.h" #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" @@ -193,8 +194,6 @@ static void prEntry( GtkContainer * container,gpointer user_data ); #endif -extern int stop_xscreensaver; - void ShowPreferences( void ) { if ( Preferences ) gtkActive( Preferences );