X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fplaylist.c;h=2a02026a32e3a034c35e7b3617155373e84cdfd4;hb=782865e801093e37cf4d5cc9643ae479f99179fa;hp=d7459443238befce93bcb422725a1d3e9207e2fb;hpb=bc6c6306298f85355ea5325fd23f890f4b7008fe;p=vlc diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index d745944323..2a02026a32 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -24,9 +24,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#ifdef WIN32 +# include +#endif +#include #include "playlist.h" @@ -34,102 +43,149 @@ * Module descriptor *****************************************************************************/ #define AUTOSTART_TEXT N_( "Auto start" ) -/// \bug [String] Why \n ? #define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \ - "content once it's loaded.\n" ) + "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." ) -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, VLC_FALSE ); - - set_shortname( _("Playlist") ); - set_description( _("Playlist") ); - add_shortcut( "old-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_Old), NULL ); -#if 0 - add_submodule(); - set_description( _("Native playlist import") ); - add_shortcut( "playlist" ); - add_shortcut( "native-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_Native), E_(Close_Native) ); -#endif - add_submodule(); - set_description( _("M3U playlist import") ); - add_shortcut( "m3u-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_M3U), E_(Close_M3U) ); - add_submodule(); - set_description( _("PLS playlist import") ); - add_shortcut( "pls-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_PLS), E_(Close_PLS) ); - add_submodule(); - set_description( _("B4S playlist import") ); - add_shortcut( "b4s-open" ); - add_shortcut( "shout-b4s" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_B4S), E_(Close_B4S) ); - add_submodule(); - set_description( _("DVB playlist import") ); - add_shortcut( "dvb-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_DVB), E_(Close_DVB) ); - add_submodule(); - set_description( _("Podcast parser") ); - add_shortcut( "podcast" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_podcast), E_(Close_podcast) ); - add_submodule(); - set_description( _("XSPF playlist import") ); - add_shortcut( "xspf-open" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(xspf_import_Activate), NULL ); - add_submodule(); - set_description( _("New winamp 5.2 shoutcast import") ); - add_shortcut( "shout-winamp" ); - set_capability( "demux2", 10 ); - set_callbacks( E_(Import_Shoutcast), E_(Close_Shoutcast) ); - add_bool( "shoutcast-show-adult", VLC_FALSE, NULL, - SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, VLC_FALSE ); -vlc_module_end(); - +#define SKIP_ADS_TEXT N_( "Skip ads" ) +#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 ) + + add_bool( "playlist-autostart", true, NULL, + AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false ) + + 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_shortname( N_("Playlist") ) + set_description( N_("Playlist") ) + add_submodule () + set_description( N_("M3U playlist import") ) + 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", "ram-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_RAM, Close_RAM ) + add_submodule () + set_description( N_("PLS playlist import") ) + 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", "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", "dvb-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_DVB, Close_DVB ) + add_submodule () + set_description( N_("Podcast parser") ) + 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", "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", "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", "asx-open" ) + set_capability( "demux", 10 ) + set_callbacks( Import_ASX, Close_ASX ) + add_submodule () + set_description( N_("Kasenna MediaBase parser") ) + 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", "qtl" ) + set_capability( "demux", 10 ) + set_callbacks( Import_QTL, Close_QTL ) + add_submodule () + set_description( N_("Google Video Playlist importer") ) + add_shortcut( "playlist", "gvp" ) + set_capability( "demux", 10 ) + set_callbacks( Import_GVP, Close_GVP ) + add_submodule () + set_description( N_("Dummy ifo demux") ) + add_shortcut( "playlist" ) + set_capability( "demux", 12 ) + set_callbacks( Import_IFO, Close_IFO ) + add_submodule () + set_description( N_("iTunes Music Library importer") ) + 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", "wpl" ) + set_capability( "demux", 10 ) + set_callbacks( Import_WPL, Close_WPL ) + add_submodule () + set_description( N_("ZPL playlist import") ) + add_shortcut( "playlist", "zpl" ) + set_capability( "demux", 10 ) + set_callbacks( Import_ZPL, Close_ZPL ) +vlc_module_end () + +input_item_t * GetCurrentItem(demux_t *p_demux) +{ + input_thread_t *p_input_thread = demux_GetParentInput( p_demux ); + input_item_t *p_current_input = input_GetItem( p_input_thread ); + vlc_gc_incref(p_current_input); + vlc_object_release(p_input_thread); + return p_current_input; +} /** * Find directory part of the path to the playlist file, in case of * relative paths inside */ -char *E_(FindPrefix)( demux_t *p_demux ) +char *FindPrefix( demux_t *p_demux ) { - char *psz_name; - char *psz_path = strdup( p_demux->psz_path ); - -#ifndef WIN32 - psz_name = strrchr( psz_path, '/' ); -#else - psz_name = strrchr( psz_path, '\\' ); - if( !psz_name ) psz_name = strrchr( psz_path, '/' ); -#endif - if( psz_name ) psz_name[1] = '\0'; - else *psz_path = '\0'; + char *psz_url; - return psz_path; + if( asprintf( &psz_url, "%s://%s", p_demux->psz_access, + p_demux->psz_location ) == -1 ) + return NULL; + + char *psz_file = strrchr( psz_url, '/' ); + assert( psz_file != NULL ); + psz_file[1] = '\0'; + + return psz_url; } /** * Add the directory part of the playlist file to the start of the * mrl, if the mrl is a relative file path */ -char *E_(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 "://" @@ -138,45 +194,33 @@ char *E_(ProcessMRL)( char *psz_mrl, char *psz_prefix ) * 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 */ - asprintf( &psz_mrl, "%s%s", psz_prefix, psz_mrl ); - return psz_mrl; -} - -vlc_bool_t E_(FindItem)( demux_t *p_demux, playlist_t *p_playlist, - playlist_item_t **pp_item ) -{ - vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" ); - - if( b_play && p_playlist->status.p_item && - &p_playlist->status.p_item->input == - ((input_thread_t *)p_demux->p_parent)->input.p_item ) - { - msg_Dbg( p_playlist, "starting playlist playback" ); - *pp_item = p_playlist->status.p_item; - b_play = VLC_TRUE; - } - else - { - input_item_t *p_current = ( (input_thread_t*)p_demux->p_parent)-> - input.p_item; - *pp_item = playlist_LockItemGetByInput( p_playlist, p_current ); - if( !*pp_item ) - { - msg_Dbg( p_playlist, "unable to find item in playlist"); - } - msg_Dbg( p_playlist, "not starting playlist playback"); - b_play = VLC_FALSE; - } - return b_play; + 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, NULL ); }