Hi,<br><br>Will this not put in an empty title, artist, etc in cases where the href tags appear before the entry tags, although this is unlikely in most cases.<br><br>Also, I believe multiple REF HREFs means that it is a fallback clip which will be played in cases where the first clip cannot be played.<br>
<br>Reference: <a href="http://msdn.microsoft.com/en-us/library/dd564247%28VS.85%29.aspx">http://msdn.microsoft.com/en-us/library/dd564247%28VS.85%29.aspx</a><br><br><div class="gmail_quote">On Wed, Oct 7, 2009 at 1:12 AM, git version control <span dir="ltr"><<a href="mailto:git@videolan.org">git@videolan.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">vlc | branch: master | Ilkka Ollakka <<a href="mailto:ileoo@videolan.org">ileoo@videolan.org</a>> | Mon Oct 5 15:48:52 2009 +0300| [b71896b3398d6c3329fb8caa34999f4c8c608257] | committer: Ilkka Ollakka<br>
<br>
asx-playlist: add ability to have multiple href in entry<br>
<br>
This should fix .asx parsing on <a href="http://www.katsomo.fi/?treeId=329&progId=20677" target="_blank">http://www.katsomo.fi/?treeId=329&progId=20677</a>.<br>
<br>
Reported by: Antti Palosaari <crope at iki dot fi><br>
<br>
> <a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b71896b3398d6c3329fb8caa34999f4c8c608257" target="_blank">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b71896b3398d6c3329fb8caa34999f4c8c608257</a><br>
---<br>
<br>
modules/demux/playlist/asx.c | 19 +++++++++++++++++++<br>
1 files changed, 19 insertions(+), 0 deletions(-)<br>
<br>
diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c<br>
index 4c79604..4daaa58 100644<br>
--- a/modules/demux/playlist/asx.c<br>
+++ b/modules/demux/playlist/asx.c<br>
@@ -606,6 +606,25 @@ static int Demux( demux_t *p_demux )<br>
i_strlen = psz_parse-psz_backup;<br>
if( i_strlen < 1 ) continue;<br>
<br>
+ if( psz_href )<br>
+ {<br>
+ /* we have allready one href in this entry, lets make new input from it and<br>
+ continue with new href, don't free meta/options*/<br>
+ input_item_t *p_entry = NULL;<br>
+ char *psz_name = input_item_GetName( p_current_input );<br>
+<br>
+ p_entry = input_item_NewExt( p_demux, psz_href, psz_name,<br>
+ 0, NULL, VLC_INPUT_OPTION_TRUSTED, -1 );<br>
+ input_item_CopyOptions( p_current_input, p_entry );<br>
+ if( psz_title_entry ) input_item_SetTitle( p_entry, psz_title_entry );<br>
+ if( psz_artist_entry ) input_item_SetArtist( p_entry, psz_artist_entry );<br>
+ if( psz_copyright_entry ) input_item_SetCopyright( p_entry, psz_copyright_entry );<br>
+ if( psz_moreinfo_entry ) input_item_SetURL( p_entry, psz_moreinfo_entry );<br>
+ if( psz_abstract_entry ) input_item_SetDescription( p_entry, psz_abstract_entry );<br>
+ input_item_AddSubItem( p_current_input, p_entry );<br>
+ vlc_gc_decref( p_entry );<br>
+ }<br>
+<br>
free( psz_href );<br>
psz_href = malloc( i_strlen +1);<br>
memcpy( psz_href, psz_backup, i_strlen );<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="http://mailman.videolan.org/listinfo/vlc-devel" target="_blank">http://mailman.videolan.org/listinfo/vlc-devel</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>Regards,<br>Srikanth Raju<br>