[vlc-devel] commit: asx-playlist: add ability to have multiple href in entry ( Ilkka Ollakka )

[Srikanth Raju]

Hi,

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.

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.

Reference: http://msdn.microsoft.com/en-us/library/dd564247%28VS.85%29.aspx

On Wed, Oct 7, 2009 at 1:12 AM, git version control <git at videolan.org>wrote:

> vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Oct  5
> 15:48:52 2009 +0300| [b71896b3398d6c3329fb8caa34999f4c8c608257] | committer:
> Ilkka Ollakka
>
> asx-playlist: add ability to have multiple href in entry
>
> This should fix .asx parsing on
> http://www.katsomo.fi/?treeId=329&progId=20677.
>
> Reported by: Antti Palosaari <crope at iki dot fi>
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b71896b3398d6c3329fb8caa34999f4c8c608257
> ---
>
>  modules/demux/playlist/asx.c |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
>
> diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
> index 4c79604..4daaa58 100644
> --- a/modules/demux/playlist/asx.c
> +++ b/modules/demux/playlist/asx.c
> @@ -606,6 +606,25 @@ static int Demux( demux_t *p_demux )
>                             i_strlen = psz_parse-psz_backup;
>                             if( i_strlen < 1 ) continue;
>
> +                            if( psz_href )
> +                            {
> +                                /* we have allready one href in this
> entry, lets make new input from it and
> +                                continue with new href, don't free
> meta/options*/
> +                                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,
> +                                                     0, NULL,
> VLC_INPUT_OPTION_TRUSTED, -1 );
> +                                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 );
> +                                if( psz_copyright_entry )
> input_item_SetCopyright( p_entry, psz_copyright_entry );
> +                                if( psz_moreinfo_entry )
> input_item_SetURL( p_entry, psz_moreinfo_entry );
> +                                if( psz_abstract_entry )
> input_item_SetDescription( p_entry, psz_abstract_entry );
> +                                input_item_AddSubItem( p_current_input,
> p_entry );
> +                                vlc_gc_decref( p_entry );
> +                            }
> +
>                             free( psz_href );
>                             psz_href = malloc( i_strlen +1);
>                             memcpy( psz_href, psz_backup, i_strlen );
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>



-- 
Regards,
Srikanth Raju
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20091007/d67f4dbe/attachment.html>