Commit 63efe9cc authored by Ilkka Ollakka's avatar Ilkka Ollakka

playlist: fix preparsing (atleast fixed it for me)

parent ffce10f0
...@@ -445,6 +445,8 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, ...@@ -445,6 +445,8 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
if( p_item == NULL ) return NULL; if( p_item == NULL ) return NULL;
AddItem( p_playlist, p_item, p_parent, i_mode, i_pos ); AddItem( p_playlist, p_item, p_parent, i_mode, i_pos );
GoAndPreparse( p_playlist, i_mode, p_item );
PL_UNLOCK_IF( !b_locked ); PL_UNLOCK_IF( !b_locked );
return p_item; return p_item;
...@@ -715,14 +717,12 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, ...@@ -715,14 +717,12 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING;
vlc_cond_signal( &pl_priv(p_playlist)->signal ); vlc_cond_signal( &pl_priv(p_playlist)->signal );
} }
/* Preparse if PREPARSE or SPREPARSE & not enough meta */ /* Preparse if not enough meta */
char *psz_artist = input_item_GetArtist( p_item->p_input ); char *psz_artist = input_item_GetArtist( p_item->p_input );
char *psz_album = input_item_GetAlbum( p_item->p_input ); char *psz_album = input_item_GetAlbum( p_item->p_input );
if( pl_priv(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 ) ) ) ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
) ) ) )
playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Locked ); playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Locked );
/* If we already have it, signal it */ /* If we already have it, signal it */
else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) ) else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment