}
/* Destroy remaining objects */
-static void ObjectGarbageCollector( playlist_t *p_playlist )
+static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t b_force )
{
vlc_object_t *p_obj;
- if( mdate() - p_playlist->gc_date < 1000000 )
+ if( !b_force )
{
- p_playlist->b_cant_sleep = VLC_TRUE;
- return;
+ if( mdate() - p_playlist->gc_date < 1000000 )
+ {
+ p_playlist->b_cant_sleep = VLC_TRUE;
+ return;
+ }
+ else if( p_playlist->gc_date == 0 )
+ return;
}
- else if( p_playlist->gc_date == 0 )
- return;
vlc_mutex_lock( &p_playlist->gc_lock );
while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_VOUT,
FIND_CHILD ) ) )
{
- if( p_obj->p_parent != (vlc_object_t*)p_playlist )
+ if( p_obj->p_parent != VLC_OBJECT(p_playlist) )
{
vlc_object_release( p_obj );
break;
while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT,
FIND_CHILD ) ) )
{
- if( p_obj->p_parent != (vlc_object_t*)p_playlist )
+ if( p_obj->p_parent != VLC_OBJECT(p_playlist) )
{
vlc_object_release( p_obj );
break;
else if( p_playlist->p_input->i_state != INIT_S )
{
PL_UNLOCK;
- ObjectGarbageCollector( p_playlist );
+ ObjectGarbageCollector( p_playlist, VLC_FALSE );
PL_LOCK;
}
}
}
p_playlist->status.i_status = PLAYLIST_STOPPED;
PL_UNLOCK
+
+ ObjectGarbageCollector( p_playlist, VLC_TRUE );
return;
}
playlist_PlayItem( p_playlist, p_item );
}
else
{
+ const vlc_bool_t b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED;
+
p_playlist->status.i_status = PLAYLIST_STOPPED;
if( p_playlist->status.p_item &&
p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG )
/* Collect garbage */
PL_UNLOCK;
- ObjectGarbageCollector( p_playlist );
+ ObjectGarbageCollector( p_playlist, b_gc_forced );
PL_LOCK;
}
}
vout_Destroy( (vout_thread_t *)p_obj );
}
- while( p_playlist->i_sds )
+ while( p_playlist->i_asds )
{
playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->pp_sds[0]->psz_module );
+ p_playlist->pp_asds[0]->p_sd->psz_module );
}
playlist_MLDump( p_playlist );
b_preparsed = VLC_TRUE;
stats_TimerStart( p_playlist, "Preparse run",
STATS_TIMER_PREPARSE );
- PL_UNLOCK;
- input_Preparse( p_playlist, p_current );
- PL_LOCK;
+ /* Do not preparse if it is already done (like by playing it) */
+ if( !input_item_IsPreparsed( p_current ) )
+ {
+ PL_UNLOCK;
+ input_Preparse( p_playlist, p_current );
+ PL_LOCK;
+ }
stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE );
}
PL_UNLOCK;
if( b_preparsed )
{
- p_current->p_meta->i_status |= ITEM_PREPARSED;
+ input_item_SetPreparsed( p_current, VLC_TRUE );
var_SetInteger( p_playlist, "item-change", p_current->i_id );
}
PL_LOCK;
* This only checks for meta, not for art
* \todo don't do this for things we won't get meta for, like vids
*/
- if( p_current->p_meta &&
- !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) )
+ 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;
PL_DEBUG("need to fetch meta for %s", p_current->psz_name );
vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
}
/* We already have all needed meta, but we need art right now */
- else if( p_current->p_meta &&
- p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
- EMPTY_STR( p_current->p_meta->psz_arturl ) )
+ else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
+ EMPTY_STR( psz_arturl ) )
{
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 );
else
{
PL_DEBUG( "no fetch required for %s (art currently %s)",
- p_current->psz_name,
- p_current->p_meta ? p_current->p_meta->psz_arturl:
- "null" );
+ psz_name, psz_arturl );
vlc_gc_decref( p_current );
}
+ free( psz_name );
+ free( psz_arturl );
PL_UNLOCK;
}
else
vlc_mutex_unlock( &p_obj->object_lock );
if( p_item )
{
- assert( p_item->p_meta );
if( !b_fetch_art )
{
input_MetaFetch( p_playlist, p_item );
- p_item->p_meta->i_status |= ITEM_META_FETCHED;
var_SetInteger( p_playlist, "item-change", p_item->i_id );
/* Fetch right now */
if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL )
}
else
{
- int i_ret = input_ArtFind( p_playlist, p_item );
+ int i_ret;
+
+ /* Check if it is not yet preparsed and if so wait for it (at most 0.5s)
+ * (This can happen if we fetch art on play)
+ * FIXME this doesn't work if we need to fetch meta before art ... */
+ for( i_ret = 0; i_ret < 10 && !input_item_IsPreparsed( p_item ); i_ret++ )
+ {
+ vlc_bool_t b_break;
+ PL_LOCK;
+ b_break = ( !p_playlist->p_input || input_GetItem(p_playlist->p_input) != p_item ||
+ p_playlist->p_input->b_die || p_playlist->p_input->b_eof || p_playlist->p_input->b_error );
+ PL_UNLOCK;
+ if( b_break )
+ break;
+ msleep( 50000 );
+ }
+
+ i_ret = input_ArtFind( p_playlist, p_item );
if( i_ret == 1 )
{
PL_DEBUG("downloading art for %s", p_item->psz_name );
if( input_DownloadAndCacheArt( p_playlist, p_item ) )
- p_item->p_meta->i_status |= ITEM_ART_NOTFOUND;
+ input_item_SetArtNotFound( p_item, VLC_TRUE );
else {
- p_item->p_meta->i_status |= ITEM_ART_FETCHED;
+ input_item_SetArtFetched( p_item, VLC_TRUE );
var_SetInteger( p_playlist, "item-change",
p_item->i_id );
}
else if( i_ret == 0 ) /* Was in cache */
{
PL_DEBUG("found art for %s in cache", p_item->psz_name );
- p_item->p_meta->i_status |= ITEM_ART_FETCHED;
+ input_item_SetArtFetched( p_item, VLC_TRUE );
var_SetInteger( p_playlist, "item-change", p_item->i_id );
}
else
{
PL_DEBUG("art not found for %s", p_item->psz_name );
- p_item->p_meta->i_status |= ITEM_ART_NOTFOUND;
+ input_item_SetArtNotFound( p_item, VLC_TRUE );
}
vlc_gc_decref( p_item );
}
projects / vlc / blobdiff