Remove unmaintained SSA demuxer

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

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 3182fc43d4d769e9fa077b9b5319f26edd75eea3..2a02026a32e3a034c35e7b3617155373e84cdfd4 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -35,6 +35,7 @@
 #ifdef WIN32
 # include <ctype.h>
 #endif
+#include <assert.h>
 
 #include "playlist.h"
 
@@ -61,8 +62,7 @@ vlc_module_begin ()
     add_bool( "playlist-autostart", true, NULL,
               AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false )
 
-    add_integer( "parent-item", 0, NULL, NULL, NULL, true )
-        change_internal ()
+    add_obsolete_integer( "parent-item" ) /* removed since 1.1.0 */
 
     add_bool( "playlist-skip-ads", true, NULL,
               SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false )
@@ -71,79 +71,64 @@ vlc_module_begin ()
     set_description( N_("Playlist") )
     add_submodule ()
         set_description( N_("M3U playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "m3u" )
-        add_shortcut( "m3u8" )
-        add_shortcut( "m3u-open" )
+        add_shortcut( "playlist", "m3u", "m3u8", "m3u-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_M3U, Close_M3U )
     add_submodule ()
         set_description( N_("RAM playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "ram-open" )
+        add_shortcut( "playlist", "ram-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_RAM, Close_RAM )
     add_submodule ()
         set_description( N_("PLS playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "pls-open" )
+        add_shortcut( "playlist", "pls-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_PLS, Close_PLS )
     add_submodule ()
         set_description( N_("B4S playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "b4s-open" )
-        add_shortcut( "shout-b4s" )
+        add_shortcut( "playlist", "b4s-open", "shout-b4s" )
         set_capability( "demux", 10 )
         set_callbacks( Import_B4S, Close_B4S )
     add_submodule ()
         set_description( N_("DVB playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "dvb-open" )
+        add_shortcut( "playlist", "dvb-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_DVB, Close_DVB )
     add_submodule ()
         set_description( N_("Podcast parser") )
-        add_shortcut( "playlist" )
-        add_shortcut( "podcast" )
+        add_shortcut( "playlist", "podcast" )
         set_capability( "demux", 10 )
         set_callbacks( Import_podcast, Close_podcast )
     add_submodule ()
         set_description( N_("XSPF playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "xspf-open" )
+        add_shortcut( "playlist", "xspf-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_xspf, Close_xspf )
     add_submodule ()
         set_description( N_("New winamp 5.2 shoutcast import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "shout-winamp" )
+        add_shortcut( "playlist", "shout-winamp" )
         set_capability( "demux", 10 )
         set_callbacks( Import_Shoutcast, Close_Shoutcast )
         add_bool( "shoutcast-show-adult", false, NULL,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
     add_submodule ()
         set_description( N_("ASX playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "asx-open" )
+        add_shortcut( "playlist", "asx-open" )
         set_capability( "demux", 10 )
         set_callbacks( Import_ASX, Close_ASX )
     add_submodule ()
         set_description( N_("Kasenna MediaBase parser") )
-        add_shortcut( "playlist" )
-        add_shortcut( "sgimb" )
+        add_shortcut( "playlist", "sgimb" )
         set_capability( "demux", 10 )
         set_callbacks( Import_SGIMB, Close_SGIMB )
     add_submodule ()
         set_description( N_("QuickTime Media Link importer") )
-        add_shortcut( "playlist" )
-        add_shortcut( "qtl" )
+        add_shortcut( "playlist", "qtl" )
         set_capability( "demux", 10 )
         set_callbacks( Import_QTL, Close_QTL )
     add_submodule ()
         set_description( N_("Google Video Playlist importer") )
-        add_shortcut( "playlist" )
-        add_shortcut( "gvp" )
+        add_shortcut( "playlist", "gvp" )
         set_capability( "demux", 10 )
         set_callbacks( Import_GVP, Close_GVP )
     add_submodule ()
@@ -153,20 +138,17 @@ vlc_module_begin ()
         set_callbacks( Import_IFO, Close_IFO )
     add_submodule ()
         set_description( N_("iTunes Music Library importer") )
-        add_shortcut( "playlist" )
-        add_shortcut( "itml" )
+        add_shortcut( "playlist", "itml" )
         set_capability( "demux", 10 )
         set_callbacks( Import_iTML, Close_iTML )
     add_submodule ()
         set_description( N_("WPL playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "wpl" )
+        add_shortcut( "playlist", "wpl" )
         set_capability( "demux", 10 )
         set_callbacks( Import_WPL, Close_WPL )
     add_submodule ()
         set_description( N_("ZPL playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "zpl" )
+        add_shortcut( "playlist", "zpl" )
         set_capability( "demux", 10 )
         set_callbacks( Import_ZPL, Close_ZPL )
 vlc_module_end ()
@@ -186,34 +168,17 @@ input_item_t * GetCurrentItem(demux_t *p_demux)
  */
 char *FindPrefix( demux_t *p_demux )
 {
-    char *psz_file;
-    char *psz_prefix;
-    char *psz_path;
-    if( p_demux->psz_access )
-    {
-        if( asprintf( &psz_path,"%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
-            return NULL;
-    }
-    else
-    {
-        psz_path = strdup( p_demux->psz_path );
-        if( psz_path == NULL )
-            return NULL;
-    }
+    char *psz_url;
 
-#ifdef WIN32
-    psz_file = strrchr( psz_path, '\\' );
-    if( !psz_file )
-#endif
-    psz_file = strrchr( psz_path, '/' );
+    if( asprintf( &psz_url, "%s://%s", p_demux->psz_access,
+                  p_demux->psz_location ) == -1 )
+        return NULL;
 
-    if( psz_file )
-        psz_prefix = strndup( psz_path, psz_file - psz_path + 1 );
-    else
-        psz_prefix = strdup( "" );
-    free( psz_path );
+    char *psz_file = strrchr( psz_url, '/' );
+    assert( psz_file != NULL );
+    psz_file[1] = '\0';
 
-    return psz_prefix;
+    return psz_url;
 }
 
 /**
@@ -257,5 +222,5 @@ char *ProcessMRL( const char *psz_mrl, const char *psz_prefix )
     return ret;
 
 uri:
-    return make_URI( psz_mrl );
+    return make_URI( psz_mrl, NULL );
 }