Commit 5094ecde authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files

asx.c: user ProcessMRL for playlist href to be able to use relative paths in playlist-file

This and earlier change to add access to prefix should fix usage of eg
http://media.meteo.it/vsat.asx playlist-file.
parent c041421d
...@@ -531,9 +531,11 @@ static int Demux( demux_t *p_demux ) ...@@ -531,9 +531,11 @@ static int Demux( demux_t *p_demux )
char *psz_current_input_name = input_item_GetName( p_current_input ); char *psz_current_input_name = input_item_GetName( p_current_input );
if( asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : psz_current_input_name ) ) != -1 ) if( asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : psz_current_input_name ) ) != -1 )
{ {
p_entry = input_item_NewExt( p_demux, psz_href, psz_name, const char *psz_mrl = ProcessMRL( psz_href, p_demux->p_sys->psz_prefix );
p_entry = input_item_NewExt( p_demux, psz_mrl, psz_name,
i_options, (const char * const *)ppsz_options, VLC_INPUT_OPTION_TRUSTED, -1 ); i_options, (const char * const *)ppsz_options, VLC_INPUT_OPTION_TRUSTED, -1 );
free( psz_name ); free( psz_name );
free( psz_mrl );
input_item_CopyOptions( p_current_input, p_entry ); input_item_CopyOptions( p_current_input, p_entry );
while( i_options ) while( i_options )
{ {
...@@ -613,8 +615,10 @@ static int Demux( demux_t *p_demux ) ...@@ -613,8 +615,10 @@ static int Demux( demux_t *p_demux )
input_item_t *p_entry = NULL; input_item_t *p_entry = NULL;
char *psz_name = input_item_GetName( p_current_input ); char *psz_name = input_item_GetName( p_current_input );
p_entry = input_item_NewExt( p_demux, psz_href, psz_name, const char *psz_mrl = ProcessMRL( psz_href, p_demux->p_sys->psz_prefix );
p_entry = input_item_NewExt( p_demux, psz_mrl, psz_name,
0, NULL, VLC_INPUT_OPTION_TRUSTED, -1 ); 0, NULL, VLC_INPUT_OPTION_TRUSTED, -1 );
free( psz_mrl );
input_item_CopyOptions( p_current_input, p_entry ); input_item_CopyOptions( p_current_input, p_entry );
if( psz_title_entry ) input_item_SetTitle( p_entry, psz_title_entry ); if( psz_title_entry ) input_item_SetTitle( p_entry, psz_title_entry );
if( psz_artist_entry ) input_item_SetArtist( p_entry, psz_artist_entry ); if( psz_artist_entry ) input_item_SetArtist( p_entry, psz_artist_entry );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment