Capture devices interface changes: put v4l2 before v4l. Put the advanced settings...

[vlc] / modules / misc / screensaver.c

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 859417a53654f184b7fca701fff3bc3be686e7c3..80c42ffa26739e66ad836a77be6d61740e7bc474 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -26,6 +26,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
@@ -36,6 +40,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#ifdef HAVE_SIGNAL_H
+#   include <signal.h>
+#endif
+
 #ifdef HAVE_DBUS
 
 #define DBUS_API_SUBJECT_TO_CHANGE
@@ -134,17 +142,22 @@ static void Deactivate( vlc_object_t *p_this )
  *****************************************************************************/
 static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
 {
-    pid_t pid;
-    switch( pid = fork() )
+    pid_t pid = fork();
+    switch( pid )
     {
         case 0:     /* we're the child */
+        {
+            sigset_t set;
+            sigemptyset (&set);
+            pthread_sigmask (SIG_SETMASK, &set, NULL);
+
             /* We don't want output */
-            fclose( stdout );
-            fclose( stderr );
-            execv( ppsz_args[0] , (char *const *)ppsz_args );
+            if( ( freopen( "/dev/null", "w", stdout ) != NULL )
+             && ( freopen( "/dev/null", "w", stderr ) != NULL ) )
+                execv( ppsz_args[0] , (char *const *)ppsz_args );
             /* If the file we want to execute doesn't exist we exit() */
-            exit( -1 );
-            break;
+            exit( EXIT_FAILURE );
+        }
         case -1:    /* we're the error */
             msg_Dbg( p_this, "Couldn't fork() while launching %s",
                      ppsz_args[0] );
@@ -152,7 +165,7 @@ static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
         default:    /* we're the parent */
             /* Wait for the child to exit.
              * We will not deadlock because we ran "/bin/sh &" */
-            waitpid( pid, NULL, 0 );
+            while( waitpid( pid, NULL, 0 ) != pid);
             break;
     }
 }
@@ -165,18 +178,19 @@ 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 );
+
 #ifdef HAVE_DBUS
     p_intf->p_sys->p_connection = dbus_init( p_intf );
 #endif
 
-    vlc_object_lock( p_intf );
-    for(;;)
+    while( vlc_object_alive( p_intf ) )
     {
         vlc_object_t *p_vout;
 
         /* Check screensaver every 30 seconds */
         if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
-            break;
+            continue;
 
         p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );