Fullscreen controller

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 3f732044b0e08f8cde2b37b64202c87bd76b8e70..bcda392443f98883883286ad82ef6289391ab054 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -26,8 +26,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#include <assert.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
@@ -195,34 +195,6 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
     }
 
     vlc_mutex_lock( &p_playlist->gc_lock );
-    while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
-                                                  FIND_CHILD ) ) )
-    {
-        if( p_obj->p_parent != VLC_OBJECT(p_playlist->p_libvlc) )
-        {
-            vlc_object_release( p_obj );
-            break;
-        }
-        msg_Dbg( p_playlist, "garbage collector destroying 1 vout" );
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        vout_Destroy( (vout_thread_t *)p_obj );
-    }
-#ifdef ENABLE_SOUT
-    while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT,
-                                                  FIND_CHILD ) ) )
-    {
-        if( p_obj->p_parent != VLC_OBJECT(p_playlist) )
-        {
-            vlc_object_release( p_obj );
-            break;
-        }
-        msg_Dbg( p_playlist, "garbage collector destroying 1 sout" );
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        sout_DeleteInstance( (sout_instance_t*)p_obj );
-    }
-#endif
     p_playlist->b_cant_sleep = false;
     vlc_mutex_unlock( &p_playlist->gc_lock );
 }
@@ -263,10 +235,16 @@ check_input:
         {
             int i_activity;
             input_thread_t *p_input;
+            sout_instance_t **pp_sout =
+                &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+
             PL_DEBUG( "dead input" );
 
             p_input = p_playlist->p_input;
             p_playlist->p_input = NULL;
+            assert( *pp_sout == NULL );
+            if( var_CreateGetBool( p_input, "sout-keep" ) )
+                *pp_sout = input_DetachSout( p_input );
 
             /* Release the playlist lock, because we may get stuck
              * in vlc_object_release() for some time. */
@@ -404,6 +382,9 @@ void playlist_LastLoop( playlist_t *p_playlist )
             p_playlist->p_input = NULL;
             PL_UNLOCK;
 
+            /* sout-keep: no need to anything here.
+             * The last input will destroy its sout, if any, by itself */
+
             /* Destroy input */
             vlc_object_release( p_input );
             continue;
@@ -429,25 +410,12 @@ void playlist_LastLoop( playlist_t *p_playlist )
     }
 
 #ifdef ENABLE_SOUT
-    /* close all remaining sout */
-    while( ( p_obj = vlc_object_find( p_playlist,
-                                      VLC_OBJECT_SOUT, FIND_CHILD ) ) )
-    {
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        sout_DeleteInstance( (sout_instance_t*)p_obj );
-    }
+    /* close the remaining sout-keep (if there was no input atm) */
+    sout_instance_t *p_sout = libvlc_priv (p_playlist->p_libvlc)->p_sout;
+    if (p_sout)
+        sout_DeleteInstance( p_sout );
 #endif
 
-    /* close all remaining vout */
-    while( ( p_obj = vlc_object_find( p_playlist,
-                                      VLC_OBJECT_VOUT, FIND_CHILD ) ) )
-    {
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        vout_Destroy( (vout_thread_t *)p_obj );
-    }
-
     while( p_playlist->i_sds )
     {
         playlist_ServicesDiscoveryRemove( p_playlist,
@@ -483,16 +451,14 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
     input_item_t *p_current;
     int i_activity;
 
-    while( !p_playlist->b_die )
+    vlc_object_lock( p_obj );
+
+    while( vlc_object_alive( p_obj ) )
     {
-        vlc_object_lock( p_obj );
-        while( p_obj->i_waiting == 0 )
+        if( p_obj->i_waiting == 0 )
         {
-            if( vlc_object_wait( p_obj ) || p_playlist->b_die )
-            {
-                vlc_object_unlock( p_obj );
-                return;
-            }
+            vlc_object_wait( p_obj );
+            continue;
         }
 
         p_current = p_obj->pp_waiting[0];
@@ -556,7 +522,9 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
         vlc_object_unlock( p_obj );
         /* Sleep at least 1ms */
         msleep( (i_activity+1) * 1000 );
+        vlc_object_lock( p_obj );
     }
+    vlc_object_unlock( p_obj );
 }
 
 /**
@@ -572,17 +540,14 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
     input_item_t *p_item;
     int i_activity;
 
-    while( !p_playlist->b_die )
+    vlc_mutex_lock( &p_obj->object_lock );
+
+    while( vlc_object_alive( p_obj ) )
     {
-        vlc_mutex_lock( &p_obj->object_lock );
-        while( p_obj->i_waiting == 0 )
+        if( p_obj->i_waiting == 0 )
         {
-            vlc_cond_wait( &p_obj->object_wait, &p_obj->object_lock );
-            if( p_playlist->b_die )
-            {
-                vlc_mutex_unlock( &p_obj->object_lock );
-                return;
-            }
+            vlc_object_wait( p_obj );
+            continue;
         }
 
         p_item = p_obj->pp_waiting[0];
@@ -638,7 +603,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
         vlc_object_unlock( p_obj );
         /* Sleep at least 1ms */
         msleep( (i_activity+1) * 1000 );
+        vlc_mutex_lock( &p_obj->object_lock );
     }
+    vlc_mutex_unlock( &p_obj->object_lock );
 }
 
 static void VariablesInit( playlist_t *p_playlist )
@@ -665,10 +632,6 @@ static void VariablesInit( playlist_t *p_playlist )
 
     var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL );
 
-    var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
-    val.b_bool = true;
-    var_Set( p_playlist, "intf-show", val );
-
     var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
     var_SetInteger( p_playlist, "activity", 0 );