Skip to content

V
vlc
Commit 2f2c4b07 authored by Alex Warhawk's avatar Alex Warhawk Committed by Jean-Baptiste Kempf
Browse files
Options

Reshuffle after playthrough 

Close #3932
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 03380175
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 0 deletions
src/playlist/thread.c
View file @ 2f2c4b07
...@@ -332,6 +332,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist ) ...@@ -332,6 +332,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
if( p_playlist->i_current_index >= p_playlist->current.i_size ) if( p_playlist->i_current_index >= p_playlist->current.i_size )
{ {
PL_DEBUG( "looping - restarting at beginning of node" ); PL_DEBUG( "looping - restarting at beginning of node" );
/* reshuffle playlist when end is reached */
if( var_GetBool( p_playlist, "random" ) ) {
PL_DEBUG( "reshuffle playlist" );
ResetCurrentlyPlaying( p_playlist,
get_current_status_item( p_playlist ) );
}
p_playlist->i_current_index = 0; p_playlist->i_current_index = 0;
} }
} }
...@@ -346,6 +352,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist ) ...@@ -346,6 +352,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
if( p_playlist->i_current_index <= -1 ) if( p_playlist->i_current_index <= -1 )
{ {
PL_DEBUG( "looping - restarting at end of node" ); PL_DEBUG( "looping - restarting at end of node" );
/* reshuffle playlist when beginning is reached */
if( var_GetBool( p_playlist, "random" ) ) {
PL_DEBUG( "reshuffle playlist" );
ResetCurrentlyPlaying( p_playlist,
get_current_status_item( p_playlist ) );
}
p_playlist->i_current_index = p_playlist->current.i_size-1; p_playlist->i_current_index = p_playlist->current.i_size-1;
} }
} }
...@@ -406,6 +418,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist ) ...@@ -406,6 +418,12 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
{ {
if( !b_loop || p_playlist->current.i_size == 0 ) if( !b_loop || p_playlist->current.i_size == 0 )
return NULL; return NULL;
/* reshuffle after last item has been played */
if( var_GetBool( p_playlist, "random" ) ) {
PL_DEBUG( "reshuffle playlist" );
ResetCurrentlyPlaying( p_playlist,
get_current_status_item( p_playlist ) );
}
p_playlist->i_current_index = 0; p_playlist->i_current_index = 0;
} }
PL_DEBUG( "using item %i", p_playlist->i_current_index ); PL_DEBUG( "using item %i", p_playlist->i_current_index );
......
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