playlist: add a input-current variable for being completely predictable

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 608ac8b197cb0b4db09497fcedcaed8ac5720140..0d68bb4c371ae9d226c23a9fed61b3c749efe67c 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -49,7 +49,7 @@ static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
     PL_LOCK;
 
     pl_priv(p_playlist)->b_reset_currently_playing = true;
-    vlc_object_signal_unlocked( p_playlist );
+    vlc_cond_signal( &pl_priv(p_playlist)->signal );
 
     PL_UNLOCK;
     return VLC_SUCCESS;
@@ -81,6 +81,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;
 
     VariablesInit( p_playlist );
+    vlc_mutex_init( &p->lock );
+    vlc_cond_init( &p->signal );
 
     /* Initialise data structures */
     pl_priv(p_playlist)->i_last_playlist_id = 0;
@@ -99,8 +101,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     pl_priv(p_playlist)->b_doing_ml = false;
 
-    pl_priv(p_playlist)->b_auto_preparse =
-                        var_CreateGetBool( p_playlist, "auto-preparse" ) ;
+    const bool b_auto_preparse = var_CreateGetBool( p_playlist, "auto-preparse" );
+    pl_priv(p_playlist)->b_auto_preparse = b_auto_preparse;
 
     PL_LOCK; /* playlist_NodeCreate will check for it */
     p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
@@ -154,7 +156,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     pl_priv(p_playlist)->b_auto_preparse = false;
     playlist_MLLoad( p_playlist );
-    pl_priv(p_playlist)->b_auto_preparse = true;
+    pl_priv(p_playlist)->b_auto_preparse = b_auto_preparse;
 
     vlc_object_set_destructor( p_playlist, playlist_Destructor );
 
@@ -174,11 +176,32 @@ static void playlist_Destructor( vlc_object_t * p_this )
     playlist_t *p_playlist = (playlist_t *)p_this;
     playlist_private_t *p_sys = pl_priv(p_playlist);
 
-    assert( !p_sys->p_sout );
+    assert( !p_sys->p_input );
+    assert( !p_sys->p_input_resource );
     assert( !p_sys->p_preparser );
     assert( !p_sys->p_fetcher );
 
-    msg_Err( p_this, "Destroyed" );
+    vlc_cond_destroy( &p_sys->signal );
+    vlc_mutex_destroy( &p_sys->lock );
+
+    /* Remove all remaining items */
+    FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
+        free( p_del->pp_children );
+        vlc_gc_decref( p_del->p_input );
+        free( p_del );
+    FOREACH_END();
+    ARRAY_RESET( p_playlist->all_items );
+    FOREACH_ARRAY( playlist_item_t *p_del, p_sys->items_to_delete )
+        free( p_del->pp_children );
+        vlc_gc_decref( p_del->p_input );
+        free( p_del );
+    FOREACH_END();
+    ARRAY_RESET( p_sys->items_to_delete );
+
+    ARRAY_RESET( p_playlist->items );
+    ARRAY_RESET( p_playlist->current );
+
+    msg_Dbg( p_this, "Destroyed" );
 }
 
 /** Get current playing input.
@@ -245,25 +268,19 @@ void set_current_status_node( playlist_t * p_playlist,
 
 static void VariablesInit( playlist_t *p_playlist )
 {
-    vlc_value_t val;
     /* These variables control updates */
     var_Create( p_playlist, "intf-change", VLC_VAR_BOOL );
-    val.b_bool = true;
-    var_Set( p_playlist, "intf-change", val );
+    var_SetBool( p_playlist, "intf-change", true );
 
-    var_Create( p_playlist, "item-change", VLC_VAR_INTEGER );
-    val.i_int = -1;
-    var_Set( p_playlist, "item-change", val );
+    var_Create( p_playlist, "item-change", VLC_VAR_ADDRESS );
 
-    var_Create( p_playlist, "item-deleted", VLC_VAR_INTEGER );
-    val.i_int = -1;
-    var_Set( p_playlist, "item-deleted", val );
+    var_Create( p_playlist, "playlist-item-deleted", VLC_VAR_INTEGER );
+    var_SetInteger( p_playlist, "playlist-item-deleted", -1 );
 
-    var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS );
+    var_Create( p_playlist, "playlist-item-append", VLC_VAR_ADDRESS );
 
-    var_Create( p_playlist, "playlist-current", VLC_VAR_INTEGER );
-    val.i_int = -1;
-    var_Set( p_playlist, "playlist-current", val );
+    var_Create( p_playlist, "item-current", VLC_VAR_ADDRESS );
+    var_Create( p_playlist, "input-current", VLC_VAR_ADDRESS );
 
     var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
     var_SetInteger( p_playlist, "activity", 0 );
@@ -281,24 +298,17 @@ static void VariablesInit( playlist_t *p_playlist )
     var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 }
 
-int playlist_CurrentId( playlist_t * p_playlist )
-{
-    return pl_priv(p_playlist)->status.p_item->i_id;
-
-}
-
-bool playlist_IsPlaying( playlist_t * p_playlist )
-{
-    return ( pl_priv(p_playlist)->status.i_status == PLAYLIST_RUNNING &&
-            !(pl_priv(p_playlist)->request.b_request && pl_priv(p_playlist)->request.i_status == PLAYLIST_STOPPED) );
-}
-
 playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )
 {
+    PL_ASSERT_LOCKED;
+
     return pl_priv(p_playlist)->status.p_item;
 }
 
 int playlist_Status( playlist_t * p_playlist )
 {
+    PL_ASSERT_LOCKED;
+
     return pl_priv(p_playlist)->status.i_status;
 }
+