Commit ab0e40f0 authored by Laurent Aimar's avatar Laurent Aimar

Do not access internal fetcher data from playlist and preparser.

parent 3842395a
......@@ -480,8 +480,8 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
}
free( psz_uri );
/* FIXME remove access to fetcher private data */
if( pl_priv(p_playlist)->p_fetcher->i_art_policy == ALBUM_ART_WHEN_PLAYED )
/* TODO store art policy in playlist private data */
if( var_GetInteger( p_playlist, "album-art" ) == ALBUM_ART_WHEN_PLAYED )
{
bool b_has_art;
......
......@@ -47,6 +47,8 @@ struct playlist_preparser_t
vlc_cond_t wait;
input_item_t **pp_waiting;
int i_waiting;
int i_art_policy;
};
static void *Thread( void * );
......@@ -64,6 +66,7 @@ playlist_preparser_t *playlist_preparser_New( playlist_t *p_playlist, playlist_f
p_preparser->p_fetcher = p_fetcher;
vlc_mutex_init( &p_preparser->lock );
vlc_cond_init( &p_preparser->wait );
p_preparser->i_art_policy = var_GetInteger( p_playlist, "album-art" );
p_preparser->i_waiting = 0;
p_preparser->pp_waiting = NULL;
......@@ -154,7 +157,7 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
const char *psz_arturl = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
const char *psz_name = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
if( p_fetcher && p_fetcher->i_art_policy == ALBUM_ART_ALL &&
if( p_preparser->i_art_policy == ALBUM_ART_ALL &&
( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
{
msg_Dbg( p_playlist, "meta ok for %s, need to fetch art", psz_name );
......@@ -168,7 +171,7 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
}
vlc_mutex_unlock( &p_item->lock );
if( b_fetch )
if( b_fetch && p_fetcher )
playlist_fetcher_Push( p_fetcher, p_item );
}
......
......@@ -29,7 +29,7 @@
* Preparser opaque structure.
*
* The preparser object will retreive the meta data of any given input item in
* an asynchronious way.
* an asynchronous way.
* It will also issue art fetching requests.
*/
typedef struct playlist_preparser_t playlist_preparser_t;
......@@ -48,7 +48,7 @@ playlist_preparser_t *playlist_preparser_New( playlist_t *, playlist_fetcher_t *
void playlist_preparser_Push( playlist_preparser_t *, input_item_t * );
/**
* This function destroy the preparser object and thread.
* This function destroys the preparser object and thread.
*
* All pending input items will be released.
*/
......
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