[vlc-devel] commit: asx.c: user ProcessMRL for playlist href to be able to use relative paths in playlist-file (Ilkka Ollakka )

[git version control]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue Oct 13 11:38:34 2009 +0300| [5094ecde1ca8929d1ffba9f9f43e2fcc2b106c9b] | committer: Ilkka Ollakka 

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5094ecde1ca8929d1ffba9f9f43e2fcc2b106c9b
---

 modules/demux/playlist/asx.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 4daaa58..dc865bf 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -531,9 +531,11 @@ static int Demux( demux_t *p_demux )
                     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 )
                     {
-                        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 );
                         free( psz_name );
+                        free( psz_mrl );
                         input_item_CopyOptions( p_current_input, p_entry );
                         while( i_options )
                         {
@@ -613,8 +615,10 @@ static int Demux( demux_t *p_demux )
                                 input_item_t *p_entry = NULL;
                                 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 );
+                                free( psz_mrl );
                                 input_item_CopyOptions( p_current_input, p_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 );