Changeset 0702b8f8e48dca927ff62d00e0a37f83dacd1987

Timestamp:

02/09/06 23:22:19 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1157232139 +0000

git-parent:

[1aa4230a8154b65139570ee8a953e9cc0b0b2bfd]

git-author:

Clément Stenac <zorglub@videolan.org> 1157232139 +0000

Message:

Add --play-and-exit option to quit after no more items are in playlist.
To be backported, but will need some manual merging (diff in vlc-devel should apply pristine to 0.8.5).
Thanks to Georgi Chorbadzhiyski for the patch

Files:

• src/libvlc.h (modified) (2 diffs)
• src/playlist/engine.c (modified) (4 diffs)

src/libvlc.h

@@ -954 +954 @@
-#define PAS_LONGTEXT N_( \
-    "Stop the playlist after each played playlist item." )
+
+#define PAE_TEXT N_("Play and exit")
+#define PAE_LONGTEXT N_( \
+                "Exit if there are no more items in the playlist." )
-
-#define ML_TEXT N_("Use media library")
@@ -1619 +1623 @@
-    add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_FALSE );
-        change_short('R');
+    add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, VLC_FALSE );
-    add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE );
-    add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, VLC_FALSE );

src/playlist/engine.c

@@ -144 +144 @@
-    var_Destroy( p_playlist, "intf-show" );
-    var_Destroy( p_playlist, "play-and-stop" );
+    var_Destroy( p_playlist, "play-and-exit" );
-    var_Destroy( p_playlist, "random" );
-    var_Destroy( p_playlist, "repeat" );
@@ -210 +211 @@
-{
-    playlist_item_t *p_item = NULL;
-
-
+
-    PL_LOCK
-
@@ -322 +322 @@
-             {
-                msg_Dbg( p_playlist, "nothing to play" );
+                if( b_playexit == VLC_TRUE )
+                {
+                    msg_Info( p_playlist, "end of playlist, exiting" );
+                    p_playlist->p_vlc->b_die = VLC_TRUE;
+                }
-                p_playlist->status.i_status = PLAYLIST_STOPPED;
-                PL_UNLOCK
@@ -511 +516 @@
-    /* Variables to control playback */
-    var_CreateGetBool( p_playlist, "play-and-stop" );
+    var_CreateGetBool( p_playlist, "play-and-exit" );
-    var_CreateGetBool( p_playlist, "random" );
-    var_CreateGetBool( p_playlist, "repeat" );