[MPlayer-cvslog] r31451 - in trunk: cfg-mplayer.h gui/cfg.c gui/mplayer/gtk/opts.c libvo/x11_common.h

[diego]

Author: diego
Date: Thu Jun 17 11:46:44 2010
New Revision: 31451

Log:
Declare stop_xscreensaver extern in x11_common.h instead of all over the code.

Modified:
   trunk/cfg-mplayer.h
   trunk/gui/cfg.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/libvo/x11_common.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Thu Jun 17 11:40:18 2010	(r31450)
+++ trunk/cfg-mplayer.h	Thu Jun 17 11:46:44 2010	(r31451)
@@ -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[];

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Jun 17 11:40:18 2010	(r31450)
+++ trunk/gui/cfg.c	Thu Jun 17 11:46:44 2010	(r31451)
@@ -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 @@ gtkASS_t gtkASS;
 #endif
 // ---
 
-extern int    stop_xscreensaver;
 extern int    disable_gui_conf;
 int m_config_parse_config_file(m_config_t* config, char *conffile);
 

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Thu Jun 17 11:40:18 2010	(r31450)
+++ trunk/gui/mplayer/gtk/opts.c	Thu Jun 17 11:46:44 2010	(r31451)
@@ -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 prCListRow( GtkCList * clist
 static void prEntry( GtkContainer * container,gpointer user_data );
 #endif
 
-extern int    stop_xscreensaver;
-
 void ShowPreferences( void )
 {
  if ( Preferences ) gtkActive( Preferences );

Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h	Thu Jun 17 11:40:18 2010	(r31450)
+++ trunk/libvo/x11_common.h	Thu Jun 17 11:46:44 2010	(r31451)
@@ -59,6 +59,8 @@ extern int mLocalDisplay;
 
 extern int vo_mouse_autohide;
 
+extern int stop_xscreensaver;
+
 int vo_init( void );
 void vo_uninit( void );
 void vo_hidecursor ( Display* , Window );