playlist: b_reset_currently_playing is private.

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index d72e41560eb53a78cb5e918314ebb85c62b209ea..950d82c9c29ee01436f05359b384f02281d3166b 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -220,7 +220,7 @@ int playlist_ItemRelease( playlist_item_t *p_item )
      *
      * Who wants to add proper memory management? */
     uninstall_input_item_observer( p_item );
-    ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item);
+    ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item);
     return VLC_SUCCESS;
 }
 
@@ -415,7 +415,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
 {
     playlist_item_t *p_item_cat, *p_item_one;
     if( p_playlist->b_die ) return VLC_EGENERIC;
-    if( !p_playlist->b_doing_ml )
+    if( !pl_priv(p_playlist)->b_doing_ml )
         PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
                                              p_input->psz_uri );
 
@@ -632,7 +632,7 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
             DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
                              p_playlist->p_root_onelevel, false );
         }
-        p_playlist->b_reset_currently_playing = true;
+        pl_priv(p_playlist)->b_reset_currently_playing = true;
         vlc_object_signal_unlocked( p_playlist );
         var_SetInteger( p_playlist, "item-change", p_item_in_category->
                                                         p_input->i_id );
@@ -769,7 +769,7 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
     }
     else
         i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
-    p_playlist->b_reset_currently_playing = true;
+    pl_priv(p_playlist)->b_reset_currently_playing = true;
     vlc_object_signal_unlocked( p_playlist );
     return i_ret;
 }
@@ -796,7 +796,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
     p_add->i_item = i_item_id;
     p_add->i_node = i_node_id;
     val.p_address = p_add;
-    p_playlist->b_reset_currently_playing = true;
+    pl_priv(p_playlist)->b_reset_currently_playing = true;
     if( b_signal )
         vlc_object_signal_unlocked( p_playlist );
 
@@ -852,18 +852,18 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
             p_parent = p_parent->p_parent;
         }
         assert( p_toplay );
-        p_playlist->request.b_request = true;
-        p_playlist->request.i_skip = 0;
-        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;
+        pl_priv(p_playlist)->request.b_request = true;
+        pl_priv(p_playlist)->request.i_skip = 0;
+        pl_priv(p_playlist)->request.p_item = p_toplay;
+        if( pl_priv(p_playlist)->p_input )
+            input_StopThread( pl_priv(p_playlist)->p_input );
+        pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING;
         vlc_object_signal_unlocked( p_playlist );
     }
     /* Preparse if PREPARSE or SPREPARSE & not enough meta */
     char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
     char *psz_album = input_item_GetAlbum( p_item_cat->p_input );
-    if( p_playlist->b_auto_preparse &&
+    if( pl_priv(p_playlist)->b_auto_preparse &&
           (i_mode & PLAYLIST_PREPARSE ||
           ( i_mode & PLAYLIST_SPREPARSE &&
             ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
@@ -889,7 +889,7 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
     else
         playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
 
-    if( !p_playlist->b_doing_ml )
+    if( !pl_priv(p_playlist)->b_doing_ml )
         playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id,
                                  !( i_mode & PLAYLIST_NO_REBUILD ) );
 }
@@ -919,7 +919,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
     {
         return playlist_NodeDelete( p_playlist, p_item, true, false );
     }
-    p_playlist->b_reset_currently_playing = true;
+    pl_priv(p_playlist)->b_reset_currently_playing = true;
     var_SetInteger( p_playlist, "item-deleted", i_id );
 
     /* Remove the item from the bank */
@@ -937,9 +937,9 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
         /* Hack we don't call playlist_Control for lock reasons */
         if( b_stop )
         {
-            p_playlist->request.i_status = PLAYLIST_STOPPED;
-            p_playlist->request.b_request = true;
-            p_playlist->request.p_item = NULL;
+            pl_priv(p_playlist)->request.i_status = PLAYLIST_STOPPED;
+            pl_priv(p_playlist)->request.b_request = true;
+            pl_priv(p_playlist)->request.p_item = NULL;
             msg_Info( p_playlist, "stopping playback" );
             vlc_object_signal_unlocked( VLC_OBJECT(p_playlist) );
         }