]> git.sesse.net Git - vlc/blobdiff - src/playlist/engine.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix a Typo.
[vlc] / src / playlist / engine.c
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 1c9d8f40fd83a70fbe83684362d13b9f7bcfc024..3383331895314c73b7852941d0deb0b7e3443215 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -66,8 +66,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
         return NULL;
     }
 
-    p_playlist->p_internal = malloc(sizeof(struct playlist_internal_t));
-    memset( p_playlist->p_internal, 0, sizeof(struct playlist_internal_t) );
+    TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
 
     p_parent->p_libvlc->p_playlist = p_playlist;
 
@@ -101,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;
 
@@ -121,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
     {
@@ -167,7 +158,7 @@ void playlist_Destroy( playlist_t *p_playlist )
     var_Destroy( p_playlist, "intf-change" );
     var_Destroy( p_playlist, "item-change" );
     var_Destroy( p_playlist, "playlist-current" );
-    var_Destroy( p_playlist, "intf-popmenu" );
+    var_Destroy( p_playlist, "intf-popupmenu" );
     var_Destroy( p_playlist, "intf-show" );
     var_Destroy( p_playlist, "play-and-stop" );
     var_Destroy( p_playlist, "play-and-exit" );
@@ -178,7 +169,6 @@ void playlist_Destroy( playlist_t *p_playlist )
 
     vlc_mutex_destroy( &p_playlist->gc_lock );
     vlc_object_detach( p_playlist );
-    free( p_playlist->p_internal );
     vlc_object_destroy( p_playlist );
 }
 
@@ -266,7 +256,7 @@ check_input:
 
             /* Release the playlist lock, because we may get stuck
              * in input_DestroyThread() for some time. */
-            PL_UNLOCK
+            PL_UNLOCK;
 
             /* Destroy input */
             input_DestroyThread( p_input );
@@ -297,7 +287,7 @@ check_input:
         {
             PL_DEBUG( "dying input" );
             PL_UNLOCK;
-            msleep( 25000 ); // 25 ms
+            msleep( INTF_IDLE_SLEEP );
             PL_LOCK;
             goto check_input;
         }
@@ -336,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;
              }
@@ -368,7 +358,7 @@ check_input:
             PL_LOCK;
         }
     }
-    PL_UNLOCK
+    PL_UNLOCK;
 }
 
 /** Playlist dying last loop */
@@ -379,11 +369,10 @@ void playlist_LastLoop( playlist_t *p_playlist )
     /* If there is an input, kill it */
     while( 1 )
     {
-        PL_LOCK
-
+        PL_LOCK;
         if( p_playlist->p_input == NULL )
         {
-            PL_UNLOCK
+            PL_UNLOCK;
             break;
         }
 
@@ -394,7 +383,7 @@ void playlist_LastLoop( playlist_t *p_playlist )
             /* Unlink current input */
             p_input = p_playlist->p_input;
             p_playlist->p_input = NULL;
-            PL_UNLOCK
+            PL_UNLOCK;
 
             /* Destroy input */
             input_DestroyThread( p_input );
@@ -408,15 +397,14 @@ void playlist_LastLoop( playlist_t *p_playlist )
         else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
         {
             input_StopThread( p_playlist->p_input );
-            PL_UNLOCK
+            PL_UNLOCK;
             continue;
         }
         else
         {
             p_playlist->p_input->b_eof = 1;
         }
-
-        PL_UNLOCK
+        PL_UNLOCK;
 
         msleep( INTF_IDLE_SLEEP );
     }
@@ -439,10 +427,10 @@ void playlist_LastLoop( playlist_t *p_playlist )
         vout_Destroy( (vout_thread_t *)p_obj );
     }
 
-    while( p_playlist->p_internal->i_asds )
+    while( p_playlist->i_sds )
     {
         playlist_ServicesDiscoveryRemove( p_playlist,
-                                          p_playlist->p_internal->pp_asds[0]->p_sd->psz_module );
+                                          p_playlist->pp_sds[0]->p_sd->psz_module );
     }
 
     playlist_MLDump( p_playlist );
@@ -497,17 +485,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( p_current->i_type == ITEM_TYPE_FILE )
             {
-                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) */
@@ -518,15 +497,11 @@ 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
@@ -544,12 +519,12 @@ 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( psz_arturl ) )
+                        ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
             {
                 preparse_item_t p;
                 PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
@@ -559,8 +534,8 @@ 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 );
             }
             else
             {
@@ -613,8 +588,14 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
         {
             if( !b_fetch_art )
             {
-                input_MetaFetch( p_playlist, p_item );
-                var_SetInteger( p_playlist, "item-change", p_item->i_id );
+                /* If the user doesn't want us to fetch meta automatically 
+                 * abort here. */
+                if( p_playlist->p_fetcher->b_fetch_meta )
+                {
+                    input_MetaFetch( p_playlist, p_item );
+                    var_SetInteger( p_playlist, "item-change", p_item->i_id );
+                }
+
                 /*  Fetch right now */
                 if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL )
                 {
Unnamed repository; edit this file 'description' to name the repository.