[vlc-commits] playlist: do create play-and-exit variable

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct  7 18:20:34 2013 +0300| [db0f37abd7a16cba748357746661132eb58df038] | committer: Rémi Denis-Courmont

playlist: do create play-and-exit variable

(as with play-and-stop)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db0f37abd7a16cba748357746661132eb58df038
---

 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 0873a97..8207c79 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-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 );
     var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index e86362f..594fb6b 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -510,7 +510,7 @@ static void LoopRequest( playlist_t *p_playlist, int i_status )
     msg_Dbg( p_playlist, "nothing to play" );
     p_sys->status.i_status = PLAYLIST_STOPPED;
 
-    if( var_GetBool( p_playlist, "play-and-exit" ) )
+    if( var_InheritBool( p_playlist, "play-and-exit" ) )
     {
         msg_Info( p_playlist, "end of playlist, exiting" );
         libvlc_Quit( p_playlist->p_libvlc );