Stop playback if --no-playlist-autostart (Closes:#718)

[vlc] / modules / demux / playlist / playlist.c

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 70507e1c29ae97caf987968e08caa61f722eb0b6..f2acf2ddc418930f1d743046aca41ddce0558ac5 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -51,12 +51,10 @@ vlc_module_begin();
               AUTOSTART_TEXT, AUTOSTART_LONGTEXT, VLC_FALSE );
 
     add_integer( "parent-item", 0, NULL, NULL, NULL, VLC_TRUE );
+        change_internal();
 
     set_shortname( _("Playlist") );
     set_description( _("Playlist") );
-    add_shortcut( "old-open" );
-    set_capability( "demux2", 10 );
-    set_callbacks( E_(Import_Old), NULL );
     add_submodule();
         set_description( _("M3U playlist import") );
         add_shortcut( "m3u-open" );
@@ -95,6 +93,26 @@ vlc_module_begin();
         set_callbacks( E_(Import_Shoutcast), E_(Close_Shoutcast) );
         add_bool( "shoutcast-show-adult", VLC_FALSE, NULL,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, VLC_FALSE );
+    add_submodule();
+        set_description( _("ASX playlist import") );
+        add_shortcut( "asx-open" );
+        set_capability( "demux2", 10 );
+        set_callbacks( E_(Import_ASX), E_(Close_ASX) );
+    add_submodule();
+        set_description( _("Kasenna MediaBase parser") );
+        add_shortcut( "sgimb" );
+        set_capability( "demux2", 10 );
+        set_callbacks( E_(Import_SGIMB), E_(Close_SGIMB) );
+    add_submodule();
+        set_description( _("QuickTime Media Link importer") );
+        add_shortcut( "qtl" );
+        set_capability( "demux2", 10 );
+        set_callbacks( E_(Import_QTL), E_(Close_QTL) );
+    add_submodule();
+        set_description( _("Google Video Playlist importer") );
+        add_shortcut( "gvp" );
+        set_capability( "demux2", 10 );
+        set_callbacks( E_(Import_GVP), E_(Close_GVP) );
 vlc_module_end();
 
 
@@ -167,7 +185,7 @@ void E_(AddToPlaylist)( demux_t *p_demux, playlist_t *p_playlist,
        playlist_BothAddInput( p_playlist, p_input, p_item,
                               PLAYLIST_APPEND, PLAYLIST_END );
    }
-   vlc_input_item_CopyOptions( p_item->p_input, p_input );
+   input_ItemCopyOptions( p_item->p_input, p_input );
 }
 
 
@@ -194,6 +212,7 @@ vlc_bool_t E_(FindItem)( demux_t *p_demux, playlist_t *p_playlist,
              msg_Dbg( p_playlist, "unable to find item in playlist");
          }
          msg_Dbg( p_playlist, "not starting playlist playback");
+         p_playlist->status.i_status = PLAYLIST_STOPPED;
          b_play = VLC_FALSE;
      }
      return b_play;