Changeset 7ca46db5b0de9a4f15de790990303cc46b496e24

Timestamp:

06/28/08 21:22:00 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214680920 +0300

git-parent:

[c2c6729b7abd3a0d1096c79251a6d05a2e9a3403]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214680920 +0300

Message:

playlist: release video outputs *once* - fixes #1593

Releasing other thread's references is not a very good idea...

Files:

• src/playlist/engine.c (modified) (2 diffs)

src/playlist/engine.c

@@ -182 +182 @@
-static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
-{
-    vlc_object_t *p_obj;
-
-    if( !b_force )
-    {
@@ -196 +194 @@
-
-    vlc_mutex_lock( &p_playlist->gc_lock );
-while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
-                                              FIND_CHILD ) ) )
-{
-    vlc_object_release( p_obj );
-    if( p_obj->p_parent == VLC_OBJECT(p_playlist->p_libvlc) )
-{
-    msg_Dbg( p_playlist, "garbage collector destroying 1 vout" );
-p_obj ); /* Hmm, is this (thread-)safe?? */
-}
+/* 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++)
+list->p_values[i].p_object );
+vlc_list_release( list );
-    }
-    p_playlist->b_cant_sleep = false;