Preparse playlist items that don't have enough meta

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 0ae600b2eeb4215bfc9ff7700980bd1419292ffe..64a9887b73ec1cc4f54cbe33f23a4422f11b8bf6 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -574,11 +574,22 @@ void GoAndPreparse( playlist_t *p_playlist, int i_mode,
         p_playlist->request.i_status = PLAYLIST_RUNNING;
         vlc_cond_signal( &p_playlist->object_wait );
     }
-    if( i_mode & PLAYLIST_PREPARSE &&
-        var_CreateGetBool( p_playlist, "auto-preparse" ) )
-    {
+    /* Preparse if PREPARSE or SPREPARSE & not enough meta */
+    if( p_playlist->b_auto_preparse &&
+          (i_mode & PLAYLIST_PREPARSE ||
+          ( i_mode & PLAYLIST_SPREPARSE &&
+            ( !p_item_cat->p_input->p_meta || (p_item_cat->p_input->p_meta &&
+              ( EMPTY_STR( p_item_cat->p_input->p_meta->psz_artist ) ||
+                EMPTY_STR( p_item_cat->p_input->p_meta->psz_album ) )
+              )
+            )
+          ) ) )
         playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
-    }
+    /* If we already have it, signal it */
+    else if( p_item_cat->p_input->p_meta &&
+             !EMPTY_STR( p_item_cat->p_input->p_meta->psz_artist ) &&
+             !EMPTY_STR( p_item_cat->p_input->p_meta->psz_album ) )
+        p_item_cat->p_input->p_meta->i_status = ITEM_PREPARSED;
 }
 
 /* Add the playlist item to the requested node and fire a notification */