playlist: Fetcher and parser are playlist private.

[vlc] / src / playlist / control.c

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 3e2abc479bd1a4e1b5f02c2505200c127fca0bed..d2dff95bd7dca165cb733defe808d5a72a85b0d2 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -190,19 +190,19 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
 int playlist_PreparseEnqueue( playlist_t *p_playlist,
                               input_item_t *p_item )
 {
-    vlc_object_lock( p_playlist->p_preparse );
-    if( !vlc_object_alive( p_playlist->p_preparse ) )
+    vlc_object_lock( p_playlist->p->p_preparse );
+    if( !vlc_object_alive( p_playlist->p->p_preparse ) )
     {
-        vlc_object_unlock( p_playlist->p_preparse );
+        vlc_object_unlock( p_playlist->p->p_preparse );
         return VLC_EGENERIC;
     }
     vlc_gc_incref( p_item );
-    INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
-                 p_playlist->p_preparse->i_waiting,
-                 p_playlist->p_preparse->i_waiting,
+    INSERT_ELEM( p_playlist->p->p_preparse->pp_waiting,
+                 p_playlist->p->p_preparse->i_waiting,
+                 p_playlist->p->p_preparse->i_waiting,
                  p_item );
-    vlc_object_signal_unlocked( p_playlist->p_preparse );
-    vlc_object_unlock( p_playlist->p_preparse );
+    vlc_object_signal_unlocked( p_playlist->p->p_preparse );
+    vlc_object_unlock( p_playlist->p->p_preparse );
     return VLC_SUCCESS;
 }
 
@@ -212,15 +212,15 @@ int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
                                   playlist_item_t *p_item )
 {
     vlc_object_lock( p_playlist );
-    vlc_object_lock( p_playlist->p_preparse );
-    if( !vlc_object_alive( p_playlist->p_preparse ) )
+    vlc_object_lock( p_playlist->p->p_preparse );
+    if( !vlc_object_alive( p_playlist->p->p_preparse ) )
     {
-        vlc_object_unlock( p_playlist->p_preparse );
+        vlc_object_unlock( p_playlist->p->p_preparse );
         vlc_object_unlock( p_playlist );
         return VLC_EGENERIC;
     }
     PreparseEnqueueItemSub( p_playlist, p_item );
-    vlc_object_unlock( p_playlist->p_preparse );
+    vlc_object_unlock( p_playlist->p->p_preparse );
     vlc_object_unlock( p_playlist );
     return VLC_SUCCESS;
 }
@@ -228,19 +228,19 @@ int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
 int playlist_AskForArtEnqueue( playlist_t *p_playlist,
                                input_item_t *p_item )
 {
-    vlc_object_lock( p_playlist->p_fetcher );
-    if( !vlc_object_alive( p_playlist->p_fetcher ) )
+    vlc_object_lock( p_playlist->p->p_fetcher );
+    if( !vlc_object_alive( p_playlist->p->p_fetcher ) )
     {
-        vlc_object_unlock( p_playlist->p_fetcher );
+        vlc_object_unlock( p_playlist->p->p_fetcher );
         return VLC_EGENERIC;
     }
 
     vlc_gc_incref( p_item );
-    INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
-                 p_playlist->p_fetcher->i_waiting,
-                 p_playlist->p_fetcher->i_waiting, p_item );
-    vlc_object_signal_unlocked( p_playlist->p_fetcher );
-    vlc_object_unlock( p_playlist->p_fetcher );
+    INSERT_ELEM( p_playlist->p->p_fetcher->pp_waiting,
+                 p_playlist->p->p_fetcher->i_waiting,
+                 p_playlist->p->p_fetcher->i_waiting, p_item );
+    vlc_object_signal_unlocked( p_playlist->p->p_fetcher );
+    vlc_object_unlock( p_playlist->p->p_fetcher );
     return VLC_SUCCESS;
 }
 
@@ -251,9 +251,9 @@ static void PreparseEnqueueItemSub( playlist_t *p_playlist,
     if( p_item->i_children == -1 )
     {
         vlc_gc_incref( p_item->p_input );
-        INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
-                     p_playlist->p_preparse->i_waiting,
-                     p_playlist->p_preparse->i_waiting,
+        INSERT_ELEM( p_playlist->p->p_preparse->pp_waiting,
+                     p_playlist->p->p_preparse->i_waiting,
+                     p_playlist->p->p_preparse->i_waiting,
                      p_item->p_input );
     }
     else
@@ -540,8 +540,8 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     }
     free( psz_uri );
 
-    if( p_playlist->p_fetcher &&
-            p_playlist->p_fetcher->i_art_policy == ALBUM_ART_WHEN_PLAYED )
+    if( p_playlist->p->p_fetcher &&
+            p_playlist->p->p_fetcher->i_art_policy == ALBUM_ART_WHEN_PLAYED )
     {
         bool b_has_art;