[vlc-commits] Move --playlist-autostart to main

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 29 23:30:50 2011 +0300| [8aeec8a448710f3544d31bb2d28a748c1936a73d] | committer: Rémi Denis-Courmont

Move --playlist-autostart to main

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

 modules/demux/playlist/playlist.c |    7 -------
 src/libvlc-module.c               |    6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index c17bcd6..408a76a 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -42,10 +42,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define AUTOSTART_TEXT N_( "Auto start" )
-#define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \
-                "content once it's loaded." )
-
 #define SHOW_ADULT_TEXT N_( "Show shoutcast adult content" )
 #define SHOW_ADULT_LONGTEXT N_( "Show NC17 rated video streams when " \
                 "using shoutcast video playlists." )
@@ -59,9 +55,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
 
-    add_bool( "playlist-autostart", true,
-              AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false )
-
     add_obsolete_integer( "parent-item" ) /* removed since 1.1.0 */
 
     add_bool( "playlist-skip-ads", true,
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 6ace42b..18d7896 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1272,6 +1272,10 @@ static const char *const ppsz_albumart_descriptions[] =
 #define PAP_LONGTEXT N_( \
     "Pause each item in the playlist on the last frame." )
 
+#define AUTOSTART_TEXT N_( "Auto start" )
+#define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \
+                "content once it's loaded." )
+
 #define ML_TEXT N_("Use media library")
 #define ML_LONGTEXT N_( \
     "The media library is automatically saved and reloaded each time you " \
@@ -2100,6 +2104,8 @@ vlc_module_begin ()
         change_safe()
     add_bool( "play-and-pause", 0, PAP_TEXT, PAP_LONGTEXT, true )
         change_safe()
+    add_bool( "playlist-autostart", true,
+              AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false )
     add_bool( "media-library", 0, ML_TEXT, ML_LONGTEXT, false )
 #if defined( MEDIA_LIBRARY )
     add_bool( "load-media-library-on-startup", 1, LOAD_ML_TEXT,