Commit 82451e17 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

playlist: do not create play-and-stop variable

This was not needed (but it prevented the preferences from taking effects
until VLC was restarted).
parent 7e7f263d
...@@ -483,7 +483,6 @@ static void VariablesInit( playlist_t *p_playlist ) ...@@ -483,7 +483,6 @@ static void VariablesInit( playlist_t *p_playlist )
/* Variables to control playback */ /* Variables to control playback */
var_Create( p_playlist, "playlist-autostart", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_playlist, "playlist-autostart", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_playlist, "play-and-stop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_playlist, "play-and-exit", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_playlist, "play-and-exit", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_AddCallback( p_playlist, "random", RandomCallback, NULL ); var_AddCallback( p_playlist, "random", RandomCallback, NULL );
......
...@@ -372,7 +372,7 @@ static playlist_item_t *NextItem( playlist_t *p_playlist ) ...@@ -372,7 +372,7 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
{ {
bool b_loop = var_GetBool( p_playlist, "loop" ); bool b_loop = var_GetBool( p_playlist, "loop" );
bool b_repeat = var_GetBool( p_playlist, "repeat" ); bool b_repeat = var_GetBool( p_playlist, "repeat" );
bool b_playstop = var_GetBool( p_playlist, "play-and-stop" ); bool b_playstop = var_InheritBool( p_playlist, "play-and-stop" );
/* Repeat and play/stop */ /* Repeat and play/stop */
if( b_repeat && get_current_status_item( p_playlist ) ) if( b_repeat && get_current_status_item( p_playlist ) )
......
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