pl_Yield(): return NULL when the playlist is gone (or going)

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 622f29eb7ea0e43a008927e2b89abad12a5d2591..f6385d01e3a83f63e0d750f3f1ef4270aa39b50a 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -173,9 +173,6 @@ static void playlist_Destructor( vlc_object_t * p_this )
 
     if( p_playlist->p_fetcher )
         vlc_object_release( p_playlist->p_fetcher );
-#ifndef NDEBUG
-    libvlc_priv (p_this->p_libvlc)->p_playlist = NULL; /* pl_Yield() will fail */
-#endif
 }
 
 /* Destroy remaining objects */
@@ -193,16 +190,6 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
     }
 
     vlc_mutex_lock( &p_playlist->gc_lock );
-    /* Remove video outputs when user presses stop: */
-    vlc_list_t *list = vlc_list_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
-                                      FIND_CHILD );
-    if( list != NULL )
-    {
-        msg_Dbg( p_playlist, "removing %u vout(s)", list->i_count );
-        for( int i = 0; i < list->i_count; i++)
-            vlc_object_release( list->p_values[i].p_object );
-        vlc_list_release( list );
-    }
     p_playlist->b_cant_sleep = false;
     vlc_mutex_unlock( &p_playlist->gc_lock );
 }
@@ -268,6 +255,18 @@ void playlist_set_current_input(
     }
 }
 
+/** Get current playing input.
+ */
+input_thread_t * playlist_CurrentInput( playlist_t * p_playlist )
+{
+    input_thread_t * p_input;
+    PL_LOCK;
+    p_input = p_playlist->p_input;
+    if( p_input ) vlc_object_yield( p_input );
+    PL_UNLOCK;
+    return p_input;
+}
+
 
 /**
  * @}