X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fm3u.c;h=1a054a29f05d74b2ba202b6fed54520dc0924bc6;hb=8c032439f9efb3cc5bcadb05cd12b770b1459bf6;hp=9cfda44de97fec2c3fbc662e5097cd59128e3d9c;hpb=496d33dc3e1c4be6407291c55ee5abebab4c79b7;p=vlc diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index 9cfda44de9..1a054a29f0 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -26,7 +26,11 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include @@ -47,21 +51,21 @@ static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, /***************************************************************************** * Import_M3U: main import function *****************************************************************************/ -int E_(Import_M3U)( vlc_object_t *p_this ) +int Import_M3U( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; const uint8_t *p_peek; CHECK_PEEK( p_peek, 8 ); if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) || - demux2_IsPathExtension( p_demux, ".m3u" ) || demux2_IsPathExtension( p_demux, ".vlc" ) || + demux_IsPathExtension( p_demux, ".m3u" ) || demux_IsPathExtension( p_demux, ".vlc" ) || /* A .ram file can contain a single rtsp link */ - demux2_IsPathExtension( p_demux, ".ram" ) || demux2_IsPathExtension( p_demux, ".rm" ) || - demux2_IsForced( p_demux, "m3u" ) ) ) + demux_IsPathExtension( p_demux, ".ram" ) || demux_IsPathExtension( p_demux, ".rm" ) || + demux_IsForced( p_demux, "m3u" ) ) ) return VLC_EGENERIC; STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" ); - p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux ); + p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); return VLC_SUCCESS; } @@ -69,7 +73,7 @@ int E_(Import_M3U)( vlc_object_t *p_this ) /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ -void E_(Close_M3U)( vlc_object_t *p_this ) +void Close_M3U( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; free( p_demux->p_sys->psz_prefix ); @@ -108,8 +112,7 @@ static int Demux( demux_t *p_demux ) mtime_t i_duration = -1; const char**ppsz_options = NULL; int i_options = 0; - vlc_bool_t b_cleanup = VLC_FALSE; - vlc_bool_t b_enable_extvlcopt = config_GetInt( p_demux, "m3u-extvlcopt" ); + bool b_cleanup = false; input_item_t *p_input; INIT_PLAYLIST_STUFF; @@ -140,7 +143,7 @@ static int Demux( demux_t *p_demux ) psz_parse += sizeof("EXTINF:") - 1; parseEXTINF( psz_parse, &psz_artist, &psz_name, &i_parsed_duration ); if( i_parsed_duration >= 0 ) - i_duration = i_parsed_duration * I64C(1000000); + i_duration = i_parsed_duration * INT64_C(1000000); if( psz_name ) psz_name = strdup( psz_name ); if( psz_artist ) @@ -149,22 +152,15 @@ static int Demux( demux_t *p_demux ) else if( !strncasecmp( psz_parse, "EXTVLCOPT:", sizeof("EXTVLCOPT:") -1 ) ) { - if( b_enable_extvlcopt ) - { - /* VLC Option */ - char *psz_option; - psz_parse += sizeof("EXTVLCOPT:") -1; - if( !*psz_parse ) goto error; - - psz_option = MaybeFromLocaleDup( psz_parse ); - if( psz_option ) - INSERT_ELEM( ppsz_options, i_options, i_options, - psz_option ); - } - else - { - msg_Err( p_demux, "m3u EXTVLCOPT parsing is disabled for security reasons. If you need it and trust the m3u playlist you are trying to open, please append --m3u-extvlcopt to your command line." ); - } + /* VLC Option */ + char *psz_option; + psz_parse += sizeof("EXTVLCOPT:") -1; + if( !*psz_parse ) goto error; + + psz_option = MaybeFromLocaleDup( psz_parse ); + if( psz_option ) + INSERT_ELEM( ppsz_options, i_options, i_options, + psz_option ); } } else if( !strncasecmp( psz_parse, "RTSPtext", sizeof("RTSPtext") -1 ) ) @@ -180,18 +176,22 @@ static int Demux( demux_t *p_demux ) psz_name = MaybeFromLocaleDup( psz_parse ); } - psz_mrl = E_(ProcessMRL)( psz_parse, p_demux->p_sys->psz_prefix ); + psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); MaybeFromLocaleRep( &psz_mrl ); - b_cleanup = VLC_TRUE; + b_cleanup = true; if( !psz_mrl ) goto error; - p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name, - i_options, ppsz_options, i_duration ); + p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, + 0, NULL, i_duration ); + if ( psz_artist && *psz_artist ) - input_ItemAddInfo( p_input, _(VLC_META_INFO_CAT), - _(VLC_META_ARTIST), "%s", psz_artist ); + input_item_SetArtist( p_input, psz_artist ); + input_ItemAddSubItem( p_current_input, p_input ); + for( int i = 0; i < i_options; i++ ) + input_ItemAddOpt( p_input, ppsz_options[i], 0 ); + vlc_gc_decref( p_input ); free( psz_mrl ); } @@ -200,30 +200,32 @@ static int Demux( demux_t *p_demux ) /* Fetch another line */ free( psz_line ); psz_line = stream_ReadLine( p_demux->s ); - if( !psz_line ) b_cleanup = VLC_TRUE; + if( !psz_line ) b_cleanup = true; if( b_cleanup ) { /* Cleanup state */ while( i_options-- ) free( (char*)ppsz_options[i_options] ); - if( ppsz_options ) free( ppsz_options ); + free( ppsz_options ); ppsz_options = NULL; i_options = 0; - if( psz_name ) free( psz_name ); + free( psz_name ); psz_name = NULL; - if ( psz_artist ) free( psz_artist ); + free( psz_artist ); psz_artist = NULL; i_parsed_duration = 0; i_duration = -1; - b_cleanup = VLC_FALSE; + b_cleanup = false; } } HANDLE_PLAY_AND_RELEASE; + var_Destroy( p_demux, "m3u-extvlcopt" ); return 0; /* Needed for correct operation of go back */ } static int Control( demux_t *p_demux, int i_query, va_list args ) { + VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args); return VLC_EGENERIC; }