[vlc-commits] playlist: do not create play-and-stop variable
Rémi Denis-Courmont
git at videolan.org
Mon Oct 7 17:21:20 CEST 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 7 18:10:46 2013 +0300| [82451e17197375bf24746be96bb401c4df4f7b16] | committer: 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).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82451e17197375bf24746be96bb401c4df4f7b16
---
src/playlist/engine.c | 1 -
src/playlist/thread.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index a80c3ef..0873a97 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -483,7 +483,6 @@ static void VariablesInit( playlist_t *p_playlist )
/* Variables to control playback */
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, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_AddCallback( p_playlist, "random", RandomCallback, NULL );
diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 08d9feb..e86362f 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -372,7 +372,7 @@ static playlist_item_t *NextItem( playlist_t *p_playlist )
{
bool b_loop = var_GetBool( p_playlist, "loop" );
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 */
if( b_repeat && get_current_status_item( p_playlist ) )
More information about the vlc-commits
mailing list