#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
+#include <vlc_url.h>
+#ifdef WIN32
+# include <ctype.h>
+#endif
#include "playlist.h"
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 )
set_description( N_("Playlist") )
add_submodule ()
set_description( N_("M3U playlist import") )
- add_shortcut( "playlist" )
- 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 ()
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 ()
{
char *psz_file;
char *psz_prefix;
- const char *psz_path = p_demux->psz_path;
+ 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;
+ }
#ifdef WIN32
psz_file = strrchr( psz_path, '\\' );
psz_prefix = strndup( psz_path, psz_file - psz_path + 1 );
else
psz_prefix = strdup( "" );
+ free( psz_path );
return psz_prefix;
}
* Add the directory part of the playlist file to the start of the
* mrl, if the mrl is a relative file path
*/
-char *ProcessMRL( char *psz_mrl, char *psz_prefix )
+char *ProcessMRL( const char *psz_mrl, const char *psz_prefix )
{
/* Check for a protocol name.
* for URL, we should look for "://"
* PB: on some file systems, ':' are valid characters though */
/* Simple cases first */
- if( !psz_mrl || !*psz_mrl ) return NULL;
- if( !psz_prefix || !*psz_prefix ) return strdup( psz_mrl );
+ if( !psz_mrl || !*psz_mrl )
+ return NULL;
+ if( !psz_prefix || !*psz_prefix )
+ goto uri;
/* Check if the line specifies an absolute path */
- if( *psz_mrl == '/' || *psz_mrl == '\\' ) return strdup( psz_mrl );
-
- /* Check if the line specifies an mrl/url
- * (and on win32, contains a drive letter) */
- if( strchr( psz_mrl, ':' ) ) return strdup( psz_mrl );
+ /* FIXME: that's wrong if the playlist is not a local file */
+ if( *psz_mrl == DIR_SEP_CHAR )
+ goto uri;
+#ifdef WIN32
+ /* Drive letter (this assumes URL scheme are not a single character) */
+ if( isalpha(psz_mrl[0]) && psz_mrl[1] == ':' )
+ goto uri;
+#endif
+ if( strstr( psz_mrl, "://" ) )
+ return strdup( psz_mrl );
/* This a relative path, prepend the prefix */
- if( asprintf( &psz_mrl, "%s%s", psz_prefix, psz_mrl ) != -1 )
- return psz_mrl;
- else
- return NULL;
+ char *ret;
+ char *postfix = encode_URI_component( psz_mrl );
+ /* FIXME: postfix may not be encoded correctly (esp. slashes) */
+ if( postfix == NULL
+ || asprintf( &ret, "%s%s", psz_prefix, postfix ) == -1 )
+ ret = NULL;
+ free( postfix );
+ return ret;
+
+uri:
+ return make_URI( psz_mrl );
}
projects / vlc / blobdiff