playlist_CreateNode(): add an argument to specify an input_item_t to be linked with...

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index af61df21224c720fa8ff63cce217053ba967225a..00a9166b3d53f4e1b4cdaded57e47ad5104b3baa 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -65,6 +65,9 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
         msg_Err( p_parent, "out of memory" );
         return NULL;
     }
+
+    TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
+
     p_parent->p_libvlc->p_playlist = p_playlist;
 
     VariablesInit( p_playlist );
@@ -97,18 +100,18 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
                         var_CreateGetBool( p_playlist, "auto-preparse") ;
 
     p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
-                                                       0 );
+                                    0, NULL );
     p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL,
-                                                       0 );
+                                    0, p_playlist->p_root_category->p_input );
 
     if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
         return NULL;
 
     /* Create playlist and media library */
-    p_playlist->p_local_category = playlist_NodeCreate( p_playlist,
-                              _( "Playlist" ),p_playlist->p_root_category, 0 );
-    p_playlist->p_local_onelevel =  playlist_NodeCreate( p_playlist,
-                              _( "Playlist" ), p_playlist->p_root_onelevel, 0 );
+    playlist_NodesPairCreate( p_playlist, _( "Playlist" ),
+                            &p_playlist->p_local_category,
+                            &p_playlist->p_local_onelevel, VLC_FALSE );
+
     p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
     p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
 
@@ -117,25 +120,17 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
         !p_playlist->p_local_onelevel->p_input )
         return NULL;
 
-    /* Link the nodes together. Todo: actually create them from the same input*/
-    p_playlist->p_local_onelevel->p_input->i_id =
-        p_playlist->p_local_category->p_input->i_id;
-
     if( config_GetInt( p_playlist, "media-library") )
     {
-        p_playlist->p_ml_category =   playlist_NodeCreate( p_playlist,
-                         _( "Media Library" ), p_playlist->p_root_category, 0 );
-        p_playlist->p_ml_onelevel =  playlist_NodeCreate( p_playlist,
-                         _( "Media Library" ), p_playlist->p_root_onelevel, 0 );
+        playlist_NodesPairCreate( p_playlist, _( "Media Library" ),
+                            &p_playlist->p_ml_category,
+                            &p_playlist->p_ml_onelevel, VLC_FALSE );
 
         if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)
             return NULL;
 
         p_playlist->p_ml_category->i_flags |= PLAYLIST_RO_FLAG;
         p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG;
-        p_playlist->p_ml_onelevel->p_input->i_id =
-             p_playlist->p_ml_category->p_input->i_id;
-
     }
     else
     {
@@ -331,14 +326,14 @@ check_input:
              if( p_item == NULL )
              {
                 msg_Dbg( p_playlist, "nothing to play" );
+                p_playlist->status.i_status = PLAYLIST_STOPPED;
+                PL_UNLOCK
+
                 if( b_playexit == VLC_TRUE )
                 {
                     msg_Info( p_playlist, "end of playlist, exiting" );
                     vlc_object_kill( p_playlist->p_libvlc );
                 }
-                p_playlist->status.i_status = PLAYLIST_STOPPED;
-                PL_UNLOCK
-
                 ObjectGarbageCollector( p_playlist, VLC_TRUE );
                 return;
              }
@@ -437,7 +432,7 @@ void playlist_LastLoop( playlist_t *p_playlist )
     while( p_playlist->i_sds )
     {
         playlist_ServicesDiscoveryRemove( p_playlist,
-                                          p_playlist->pp_sds[0]->psz_module );
+                                          p_playlist->pp_sds[0]->p_sd->psz_module );
     }
 
     playlist_MLDump( p_playlist );
@@ -492,17 +487,8 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
         PL_LOCK;
         if( p_current )
         {
-            vlc_bool_t b_preparsed = VLC_FALSE;
-            if( strncmp( p_current->psz_uri, "http:", 5 ) &&
-                strncmp( p_current->psz_uri, "rtsp:", 5 ) &&
-                strncmp( p_current->psz_uri, "udp:", 4 ) &&
-                strncmp( p_current->psz_uri, "mms:", 4 ) &&
-                strncmp( p_current->psz_uri, "cdda:", 4 ) &&
-                strncmp( p_current->psz_uri, "dvd:", 4 ) &&
-                strncmp( p_current->psz_uri, "v4l:", 4 ) &&
-                strncmp( p_current->psz_uri, "dshow:", 6 ) )
+            if( !strncmp( p_current->psz_uri, "file:", 5 ) )
             {
-                b_preparsed = VLC_TRUE;
                 stats_TimerStart( p_playlist, "Preparse run",
                                   STATS_TIMER_PREPARSE );
                 /* Do not preparse if it is already done (like by playing it) */
@@ -513,20 +499,18 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
                     PL_LOCK;
                 }
                 stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE );
-            }
-            PL_UNLOCK;
-            if( b_preparsed )
-            {
+                PL_UNLOCK;
                 input_item_SetPreparsed( p_current, VLC_TRUE );
                 var_SetInteger( p_playlist, "item-change", p_current->i_id );
+                PL_LOCK;
             }
-            PL_LOCK;
-
             /* If we haven't retrieved enough meta, add to secondary queue
              * which will run the "meta fetchers".
              * This only checks for meta, not for art
              * \todo don't do this for things we won't get meta for, like vids
              */
+            char *psz_arturl = input_item_GetArtURL( p_current );
+            char *psz_name = input_item_GetName( p_current );
             if( !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) )
             {
                 preparse_item_t p;
@@ -537,32 +521,32 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
                 INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
                              p_playlist->p_fetcher->i_waiting,
                              p_playlist->p_fetcher->i_waiting, p);
-                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
                 vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
             }
             /* We already have all needed meta, but we need art right now */
             else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
-                     EMPTY_STR( input_item_GetArtURL( p_current ) ) )
+                        ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
             {
                 preparse_item_t p;
-                PL_DEBUG("meta ok for %s, need to fetch art",
-                                                         p_current->psz_name );
+                PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
                 p.p_item = p_current;
                 p.b_fetch_art = VLC_TRUE;
                 vlc_mutex_lock( &p_playlist->p_fetcher->object_lock );
                 INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
                              p_playlist->p_fetcher->i_waiting,
                              p_playlist->p_fetcher->i_waiting, p);
-                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
                 vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
             }
             else
             {
                 PL_DEBUG( "no fetch required for %s (art currently %s)",
-                          p_current->psz_name,
-                          input_item_GetArtURL( p_current ));
+                          psz_name, psz_arturl );
                 vlc_gc_decref( p_current );
             }
+            free( psz_name );
+            free( psz_arturl );
             PL_UNLOCK;
         }
         else
@@ -643,7 +627,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
                         break;
                     msleep( 50000 );
                 }
-                
+
                 i_ret = input_ArtFind( p_playlist, p_item );
                 if( i_ret == 1 )
                 {