]> git.sesse.net Git - vlc/blobdiff - modules/demux/playlist/playlist.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Trailing ;
[vlc] / modules / demux / playlist / playlist.c
diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 02637e846f39f1712467f65929f261510295e7e9..e74a6755ebcfe95b9c2f82ea3505a3fa88e9cb5b 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -28,10 +28,9 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
-#include <vlc_playlist.h>
 
 #include "playlist.h"
 
@@ -50,90 +49,90 @@
 #define SKIP_ADS_LONGTEXT N_( "Use playlist options usually used to prevent " \
     "ads skipping to detect ads and prevent adding them to the playlist." )
 
-vlc_module_begin();
-    add_shortcut( "playlist" );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
+vlc_module_begin ()
+    add_shortcut( "playlist" )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
 
     add_bool( "playlist-autostart", 1, NULL,
-              AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false );
+              AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false )
 
-    add_integer( "parent-item", 0, NULL, NULL, NULL, true );
-        change_internal();
+    add_integer( "parent-item", 0, NULL, NULL, NULL, true )
+        change_internal ()
 
     add_bool( "playlist-skip-ads", 1, NULL,
-              SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false );
-
-    set_shortname( _("Playlist") );
-    set_description( _("Playlist") );
-    add_submodule();
-        set_description( _("M3U playlist import") );
-        add_shortcut( "m3u-open" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_M3U, Close_M3U );
-    add_submodule();
-        set_description( _("PLS playlist import") );
-        add_shortcut( "pls-open" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_PLS, Close_PLS );
-    add_submodule();
-        set_description( _("B4S playlist import") );
-        add_shortcut( "b4s-open" );
-        add_shortcut( "shout-b4s" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_B4S, Close_B4S );
-    add_submodule();
-        set_description( _("DVB playlist import") );
-        add_shortcut( "dvb-open" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_DVB, Close_DVB );
-    add_submodule();
-        set_description( _("Podcast parser") );
-        add_shortcut( "podcast" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_podcast, Close_podcast );
-    add_submodule();
-        set_description( _("XSPF playlist import") );
-        add_shortcut( "xspf-open" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_xspf, Close_xspf );
-    add_submodule();
-        set_description( _("New winamp 5.2 shoutcast import") );
-        add_shortcut( "shout-winamp" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_Shoutcast, Close_Shoutcast );
+              SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false )
+
+    set_shortname( N_("Playlist") )
+    set_description( N_("Playlist") )
+    add_submodule ()
+        set_description( N_("M3U playlist import") )
+        add_shortcut( "m3u-open" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_M3U, Close_M3U )
+    add_submodule ()
+        set_description( N_("PLS playlist import") )
+        add_shortcut( "pls-open" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_PLS, Close_PLS )
+    add_submodule ()
+        set_description( N_("B4S playlist import") )
+        add_shortcut( "b4s-open" )
+        add_shortcut( "shout-b4s" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_B4S, Close_B4S )
+    add_submodule ()
+        set_description( N_("DVB playlist import") )
+        add_shortcut( "dvb-open" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_DVB, Close_DVB )
+    add_submodule ()
+        set_description( N_("Podcast parser") )
+        add_shortcut( "podcast" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_podcast, Close_podcast )
+    add_submodule ()
+        set_description( N_("XSPF playlist import") )
+        add_shortcut( "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( "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( _("ASX playlist import") );
-        add_shortcut( "asx-open" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_ASX, Close_ASX );
-    add_submodule();
-        set_description( _("Kasenna MediaBase parser") );
-        add_shortcut( "sgimb" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_SGIMB, Close_SGIMB );
-    add_submodule();
-        set_description( _("QuickTime Media Link importer") );
-        add_shortcut( "qtl" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_QTL, Close_QTL );
-    add_submodule();
-        set_description( _("Google Video Playlist importer") );
-        add_shortcut( "gvp" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_GVP, Close_GVP );
-    add_submodule();
-        set_description( _("Dummy ifo demux") );
-        set_capability( "demux", 12 );
-        set_callbacks( Import_IFO, Close_IFO );
-    add_submodule();
-        set_description( _("iTunes Music Library importer") );
-        add_shortcut( "itml" );
-        set_capability( "demux", 10 );
-        set_callbacks( Import_iTML, Close_iTML );
-vlc_module_end();
+                   SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
+    add_submodule ()
+        set_description( N_("ASX playlist import") )
+        add_shortcut( "asx-open" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_ASX, Close_ASX )
+    add_submodule ()
+        set_description( N_("Kasenna MediaBase parser") )
+        add_shortcut( "sgimb" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_SGIMB, Close_SGIMB )
+    add_submodule ()
+        set_description( N_("QuickTime Media Link importer") )
+        add_shortcut( "qtl" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_QTL, Close_QTL )
+    add_submodule ()
+        set_description( N_("Google Video Playlist importer") )
+        add_shortcut( "gvp" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_GVP, Close_GVP )
+    add_submodule ()
+        set_description( N_("Dummy ifo demux") )
+        set_capability( "demux", 12 )
+        set_callbacks( Import_IFO, Close_IFO )
+    add_submodule ()
+        set_description( N_("iTunes Music Library importer") )
+        add_shortcut( "itml" )
+        set_capability( "demux", 10 )
+        set_callbacks( Import_iTML, Close_iTML )
+vlc_module_end ()
 
 
 /**
@@ -181,6 +180,8 @@ char *ProcessMRL( char *psz_mrl, char *psz_prefix )
     if( strchr( psz_mrl, ':' ) ) return strdup( psz_mrl );
 
     /* This a relative path, prepend the prefix */
-    asprintf( &psz_mrl, "%s%s", psz_prefix, psz_mrl );
-    return psz_mrl;
+    if( asprintf( &psz_mrl, "%s%s", psz_prefix, psz_mrl ) != -1 )
+        return psz_mrl;
+    else
+        return NULL;
 }
Unnamed repository; edit this file 'description' to name the repository.