Changeset 2d3be24e0f67e19dc29baced87af42481dafde21

Timestamp:

21/10/06 15:33:06 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1161437586 +0000

git-parent:

[0f382e7498b5285d73fd034d363e9aa5589289e1]

git-author:

Clément Stenac <zorglub@videolan.org> 1161437586 +0000

Message:

Don't loop continuously the playlist thread, use cond.
Not tested heavily yet ...

For interaction implementers: you need to call playlist_Signal after changing the status of a dialog. Please see the diff for qt4/dialogs/interaction.cpp

Files:

• include/vlc_playlist.h (modified) (2 diffs)
• modules/gui/qt4/dialogs/interaction.cpp (modified) (1 diff)
• src/input/input.c (modified) (3 diffs)
• src/interface/interaction.c (modified) (5 diffs)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (9 diffs)
• src/playlist/item.c (modified) (2 diffs)
• src/playlist/thread.c (modified) (2 diffs)

include/vlc_playlist.h

@@ -138 +138 @@
-    int                   i_sort; /**< Last sorting applied to the playlist */
-    int                   i_order; /**< Last ordering applied to the playlist */
-i_vout_destroyed
-mtime_t               i_sout_destroyed_date
+gc
+vlc_bool_t            b_cant_sleep
-    playlist_preparse_t  *p_preparse; /**< Preparser object */
-    playlist_secondary_preparse_t *p_secondary_preparse;/**< Preparser object */
@@ -434 +434 @@
-}
-
+/** Ask the playlist to do some work */
+static inline void playlist_Signal( playlist_t *p_playlist )
+{
+    PL_LOCK;
+    vlc_cond_signal( &p_playlist->object_wait );
+    PL_UNLOCK;
+}
+
-/**
- * @}

modules/gui/qt4/dialogs/interaction.cpp

@@ -196 +196 @@
-    hide();
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    playlist_Signal( THEPL );
-}

src/input/input.c

@@ -381 +381 @@
-    p_input->b_die = VLC_TRUE;
-
-an
+ome
-     * so use the vlc_object_find way, it's perfectly safe */
-
@@ -443 +443 @@
-        /* If we failed, wait before we are killed, and exit */
-        p_input->b_error = VLC_TRUE;
+        playlist_Signal( pl_Get( p_input ) );
-
-        Error( p_input );
@@ -469 +470 @@
-        /* We have finished */
-        p_input->b_eof = VLC_TRUE;
+        playlist_Signal( pl_Get( p_input ) );
-    }
-

src/interface/interaction.c

@@ -103 +103 @@
-            // Pretend we have hidden and destroyed it
-            if( p_dialog->i_status == HIDDEN_DIALOG )
-            {
-                p_dialog->i_status = DESTROYED_DIALOG;
-            }
-            else
-            {
-                p_dialog->i_status = HIDING_DIALOG;
-            }
-        }
-    }
-    else
-    {
-        vlc_object_yield( p_interaction->p_intf );
-    }
-
-    for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ )
@@ -526 +520 @@
-static void DialogDestroy( interaction_dialog_t *p_dialog )
-{
-FREENULL
-FREENULL
-FREENULL
-FREENULL
-FREENULL
+free
+free
+free
+free
+free
-    free( p_dialog );
-}
@@ -576 +570 @@
-        if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) // Wait for answer
-        {
+            playlist_Signal( pl_Get(p_this) );
-            while( p_dialog->i_status != ANSWERED_DIALOG &&
-                   p_dialog->i_status != HIDING_DIALOG &&
@@ -592 +587 @@
-            p_dialog->i_flags |= DIALOG_GOT_ANSWER;
-            vlc_mutex_unlock( &p_interaction->object_lock );
+            playlist_Signal( pl_Get(p_this) );
-            return p_dialog->i_return;
-        }
@@ -599 +595 @@
-            p_dialog->i_flags |=  DIALOG_GOT_ANSWER;
-            vlc_mutex_unlock( &p_interaction->object_lock );
+            playlist_Signal( pl_Get(p_this) );
-            return VLC_SUCCESS;
-        }

src/playlist/control.c

@@ -180 +180 @@
-        break;
-    }
+    vlc_cond_signal( &p_playlist->object_wait );
-
-    return VLC_SUCCESS;

src/playlist/engine.c

@@ -71 +71 @@
-    p_playlist->p_input = NULL;
-
-i_vout_destroyed
-i_sout_destroyed_date = 0
+gc
+b_cant_sleep = VLC_FALSE
-
-    ARRAY_INIT( p_playlist->items );
@@ -195 +195 @@
-
-}
+
-/* Destroy remaining objects */
-
-
+
-{
-    vlc_object_t *p_obj;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -245 +246 @@
-
-    /* First, check if we have something to do */
-    /* FIXME : this can be called several times */
-    if( p_playlist->request.b_request )
-    {
@@ -255 +255 @@
-        }
-    }
-
+
-    /* If there is an input, check that it doesn't need to die. */
-    if( p_playlist->p_input )
@@ -283 +283 @@
-            vlc_object_destroy( p_input );
-
-
-
+
+
+
+
-
-            if( p_playlist->status.p_item->i_flags
@@ -300 +302 @@
-            var_SetInteger( p_playlist, "activity", i_activity -
-                            DEFAULT_INPUT_ACTIVITY );
-
-
+
-        }
-        /* This input is dying, let it do */
@@ -307 +308 @@
-        {
-            PL_DEBUG( "dying input" );
+            msleep( 25000 ); // 25 ms
+            goto check_input;
-        }
-        /* This input has finished, ask it to die ! */
@@ -314 +317 @@
-            PL_DEBUG( "finished input" );
-            input_StopThread( p_playlist->p_input );
-
-
-
+
+
-        }
-        else if( p_playlist->p_input->i_state != INIT_S )
-        {
-            PL_UNLOCK;
-
-
-
-
-
-
-
+
+
-        }
-    }
@@ -365 +362 @@
-         else
-         {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    PL_UNLOCK

src/playlist/item.c

@@ -595 +595 @@
-        p_playlist->request.p_item = p_toplay;
-        if( p_playlist->p_input )
-        {
-            input_StopThread( p_playlist->p_input );
-        }
-        p_playlist->request.i_status = PLAYLIST_RUNNING;
+        vlc_cond_signal( &p_playlist->object_wait );
-    }
-    if( i_mode & PLAYLIST_PREPARSE &&
@@ -667 +666 @@
-            p_playlist->request.p_item = NULL;
-            msg_Info( p_playlist, "stopping playback" );
+            vlc_cond_signal( &p_playlist->object_wait );
-        }
-        b_flag = VLC_TRUE;

src/playlist/thread.c

@@ -143 +143 @@
-{
-    p_playlist->b_die = VLC_TRUE;
+    playlist_Signal( p_playlist );
-    if( p_playlist->p_preparse )
-    {
@@ -176 +177 @@
-        HandleInteraction( p_playlist );
-        HandlePlaylist( p_playlist );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-