playlist_item_array_t current; /**< Items currently being played */
int i_current_index; /**< Index in current array */
- /** Reset current item array */
- bool b_reset_currently_playing;
int i_last_playlist_id; /**< Last id to an item */
pl_priv(p_playlist)->request.p_node = p_node;
pl_priv(p_playlist)->request.p_item = p_item;
if( p_item && var_GetBool( p_playlist, "random" ) )
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
break;
case PLAYLIST_PLAY:
ARRAY_VAL(p_playlist->current,j) = p_tmp;
}
}
- p_playlist->b_reset_currently_playing = false;
+ pl_priv(p_playlist)->b_reset_currently_playing = false;
stats_TimerStop( p_playlist, STATS_TIMER_PLAYLIST_BUILD );
}
set_current_status_node( p_playlist, pl_priv(p_playlist)->request.p_node );
pl_priv(p_playlist)->request.p_node = NULL;
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
}
/* If we are asked for a node, go to it's first child */
}
}
- if( p_playlist->b_reset_currently_playing )
+ if( pl_priv(p_playlist)->b_reset_currently_playing )
/* A bit too bad to reset twice ... */
ResetCurrentlyPlaying( p_playlist, b_random, p_new );
else if( p_new )
get_current_status_item( p_playlist )->i_flags & PLAYLIST_SKIP_FLAG )
return NULL;
- if( p_playlist->b_reset_currently_playing )
+ if( pl_priv(p_playlist)->b_reset_currently_playing )
ResetCurrentlyPlaying( p_playlist, b_random,
get_current_status_item( p_playlist ) );
{
(void)psz_cmd; (void)oldval; (void)newval; (void)a;
- ((playlist_t*)p_this)->b_reset_currently_playing = true;
+ pl_priv((playlist_t*)p_this)->b_reset_currently_playing = true;
playlist_Signal( ((playlist_t*)p_this) );
return VLC_SUCCESS;
}
ARRAY_INIT( p_playlist->current );
p_playlist->i_current_index = 0;
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
pl_priv(p_playlist)->last_rebuild_date = 0;
pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
PL_ASSERT_LOCKED;
- if( p_playlist->b_reset_currently_playing &&
+ if( pl_priv(p_playlist)->b_reset_currently_playing &&
mdate() - pl_priv(p_playlist)->last_rebuild_date > 30000 ) // 30 ms
{
ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ),
DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
p_playlist->p_root_onelevel, false );
}
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
vlc_object_signal_unlocked( p_playlist );
var_SetInteger( p_playlist, "item-change", p_item_in_category->
p_input->i_id );
}
else
i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
vlc_object_signal_unlocked( p_playlist );
return i_ret;
}
p_add->i_item = i_item_id;
p_add->i_node = i_node_id;
val.p_address = p_add;
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
if( b_signal )
vlc_object_signal_unlocked( p_playlist );
{
return playlist_NodeDelete( p_playlist, p_item, true, false );
}
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
var_SetInteger( p_playlist, "item-deleted", i_id );
/* Remove the item from the bank */
bool b_cant_sleep;
mtime_t gc_date;
mtime_t last_rebuild_date;
+ bool b_reset_currently_playing; /** Reset current item array */
} playlist_private_t;
const char *psz_string )
{
PL_ASSERT_LOCKED;
- p_playlist->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string );
vlc_object_signal_unlocked( p_playlist );
return VLC_SUCCESS;