Remove last instances of FORWARD/BACKWARD state.

[vlc] / modules / misc / screensaver.c

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 3e0093bd288da743094bb171bb748ca6cca71398..62525b9f17e64676aa080e208fbc3a66af73385a 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -26,7 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 #include <vlc_aout.h>
@@ -42,7 +47,6 @@
 
 #ifdef HAVE_DBUS
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 
 #define GS_SERVICE   "org.gnome.ScreenSaver"
@@ -51,11 +55,6 @@
 
 #endif
 
-/* this is for dbus < 0.3 */
-#ifndef HAVE_DBUS_1
-#define dbus_bus_name_has_owner(connection, name, err) dbus_bus_service_exists(connection, name, err)
-#endif
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -72,7 +71,7 @@ static void poke_screensaver( intf_thread_t *p_intf,
 static void screensaver_send_message_void ( intf_thread_t *p_intf,
                                        DBusConnection *p_connection,
                                        const char *psz_name );
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection );
+static bool screensaver_is_running( DBusConnection *p_connection );
 
 
 struct intf_sys_t
@@ -85,11 +84,11 @@ struct intf_sys_t
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("X Screensaver disabler") );
-    set_capability( "interface", 0 );
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("X Screensaver disabler") )
+    set_capability( "interface", 0 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()
 
 /*****************************************************************************
  * Activate: initialize and create stuff
@@ -118,18 +117,11 @@ static void Deactivate( vlc_object_t *p_this )
 
     if( p_intf->p_sys->p_connection )
     {
-#  ifdef HAVE_DBUS_2
         dbus_connection_unref( p_intf->p_sys->p_connection );
-#  else
-        dbus_connection_disconnect( p_intf->p_sys->p_connection );
-#  endif
     }
 
-    if( p_intf->p_sys )
-    {
-        free( p_intf->p_sys );
-        p_intf->p_sys = NULL;
-    }
+    free( p_intf->p_sys );
+    p_intf->p_sys = NULL;
 #endif
 }
 
@@ -174,20 +166,15 @@ static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
  *****************************************************************************/
 static void Run( intf_thread_t *p_intf )
 {
-    vlc_object_lock( p_intf );
-
+    int canc = vlc_savecancel();
 #ifdef HAVE_DBUS
     p_intf->p_sys->p_connection = dbus_init( p_intf );
 #endif
 
-    while( vlc_object_alive( p_intf ) )
-    {
+    for( ;; )
+   {
         vlc_object_t *p_vout;
 
-        /* Check screensaver every 30 seconds */
-        if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
-            continue;
-
         p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
 
         /* If there is a video output, disable xscreensaver */
@@ -220,8 +207,11 @@ static void Run( intf_thread_t *p_intf )
                 vlc_object_release( p_input );
             }
         }
+
+        vlc_restorecancel( canc );
+        /* Check screensaver every 30 seconds */
+        msleep( 30 * CLOCK_FREQ );
     }
-    vlc_object_unlock( p_intf );
 }
 
 #ifdef HAVE_DBUS
@@ -291,12 +281,12 @@ static void screensaver_send_message_void ( intf_thread_t *p_intf,
     dbus_message_unref( p_message );
 }
 
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection )
+static bool screensaver_is_running( DBusConnection *p_connection )
 {
     DBusError error;
-    vlc_bool_t b_return;
+    bool b_return;
 
-    if( !p_connection ) return VLC_FALSE;
+    if( !p_connection ) return false;
 
     dbus_error_init( &error );
     b_return = dbus_bus_name_has_owner( p_connection, GS_SERVICE, &error );