[MPlayer-cvslog] r30574 - in trunk: libvo/x11_common.h mplayer.c

[diego]

Author: diego
Date: Sun Feb 14 13:57:18 2010
New Revision: 30574

Log:
Add xscreensaver_heartbeat() declaration to x11_common.h.
This avoids a forward declaration in mplayer.c.

Modified:
   trunk/libvo/x11_common.h
   trunk/mplayer.c

Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h	Sun Feb 14 13:55:02 2010	(r30573)
+++ trunk/libvo/x11_common.h	Sun Feb 14 13:57:18 2010	(r30574)
@@ -137,6 +137,7 @@ int xv_test_ckm( void * arg );
 void vo_setwindow( Window w,GC g );
 void vo_x11_putkey(int key);
 
+void xscreensaver_heartbeat(void);
 void saver_off( Display * );
 void saver_on( Display * );
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Feb 14 13:55:02 2010	(r30573)
+++ trunk/mplayer.c	Sun Feb 14 13:57:18 2010	(r30574)
@@ -153,12 +153,6 @@ static int cfg_include(m_option_t *conf,
 #include "get_path.h"
 
 //**************************************************************************//
-//             XScreensaver
-//**************************************************************************//
-
-void xscreensaver_heartbeat(void);
-
-//**************************************************************************//
 //**************************************************************************//
 //             Input media streaming & demultiplexer:
 //**************************************************************************//