X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fxspf.c;h=42c1ed6e0d388007b1250ff1b30d09b1a0594922;hb=37a2578ce4265f4ed495290923e3fa674c662656;hp=3bda930b058d73b3eb90f18f669f7c2a8b770fc6;hpb=7c4a54f94c8585393878c5c0e410645d50b571f1;p=vlc diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 3bda930b05..42c1ed6e0d 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -1,5 +1,11 @@ /******************************************************************************* - * Copyright (C) 2006 Daniel Stränger + * xspf.c : XSPF playlist import functions + ******************************************************************************* + * Copyright (C) 2006 the VideoLAN team + * $Id$ + * + * Authors: Daniel Stränger + * Yoann Peronneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,178 +20,192 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *******************************************************************************/ + ******************************************************************************/ /** * \file modules/demux/playlist/xspf.c * \brief XSPF playlist import functions */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "playlist.h" -#include "vlc_xml.h" -#include "vlc_strings.h" +#include +#include + +#include +#include +#include #include "xspf.h" +#include "playlist.h" -struct demux_sys_t +struct demux_sys_t { - playlist_item_t *p_item_in_category; - int i_parent_id; + input_item_t **pp_tracklist; + int i_tracklist_entries; + int i_identifier; + char * psz_base; }; +static int Control( demux_t *, int, va_list ); +static int Demux( demux_t * ); + /** * \brief XSPF submodule initialization function */ -int E_(xspf_import_Activate)( vlc_object_t *p_this ) +int Import_xspf( vlc_object_t *p_this ) { - demux_t *p_demux = (demux_t *)p_this; - char *psz_ext; - - psz_ext = strrchr ( p_demux->psz_path, '.' ); - - if( ( psz_ext && !strcasecmp( psz_ext, ".xspf") ) || - ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "xspf-open") ) ) - { - ; - } - else - { - return VLC_EGENERIC; - } - msg_Dbg( p_demux, "using xspf playlist import"); - - p_demux->p_sys = (demux_sys_t*)malloc(sizeof(demux_sys_t ) ); - - p_demux->pf_control = xspf_import_Control; - p_demux->pf_demux = xspf_import_Demux; - + DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".xspf", "xspf-open", + "using XSPF playlist reader" ); return VLC_SUCCESS; } +void Close_xspf( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t *)p_this; + FREENULL( p_demux->p_sys->pp_tracklist ); + FREENULL( p_demux->p_sys->psz_base ); + free( p_demux->p_sys ); +} + /** * \brief demuxer function for XSPF parsing */ -int xspf_import_Demux( demux_t *p_demux ) +int Demux( demux_t *p_demux ) { - int i_ret = VLC_SUCCESS; + int i_ret = 1; xml_t *p_xml = NULL; xml_reader_t *p_xml_reader = NULL; char *psz_name = NULL; INIT_PLAYLIST_STUFF; - p_demux->p_sys->p_item_in_category = p_item_in_category; - p_demux->p_sys->i_parent_id = i_parent_id; + p_demux->p_sys->pp_tracklist = NULL; + p_demux->p_sys->i_tracklist_entries = 0; + p_demux->p_sys->i_identifier = 0; + p_demux->p_sys->psz_base = NULL; /* create new xml parser from stream */ p_xml = xml_Create( p_demux ); if( !p_xml ) - i_ret = VLC_ENOMOD; + i_ret = -1; else { p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s ); if( !p_xml_reader ) - i_ret = VLC_EGENERIC; + i_ret = -1; } - /* start with parsing the root node */ - if ( i_ret == VLC_SUCCESS ) - if ( xml_ReaderRead( p_xml_reader ) != 1 ) - { - msg_Err( p_demux, "can't read xml stream" ); - i_ret = VLC_EGENERIC; - } - /* checking root node type */ - if ( i_ret == VLC_SUCCESS ) - if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ) + /* locating the root node */ + if( i_ret == 1 ) + { + do { - msg_Err( p_demux, "invalid root node type: %i", - xml_ReaderNodeType( p_xml_reader ) ); - i_ret = VLC_EGENERIC; - } + if( xml_ReaderRead( p_xml_reader ) != 1 ) + { + msg_Err( p_demux, "can't read xml stream" ); + i_ret = -1; + } + } while( i_ret == VLC_SUCCESS && + xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ); + } /* checking root node name */ - if ( i_ret == VLC_SUCCESS ) + if( i_ret == 1 ) + { psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name || strcmp( psz_name, "playlist" ) ) + if( !psz_name || strcmp( psz_name, "playlist" ) ) + { + msg_Err( p_demux, "invalid root node name: %s", psz_name ); + i_ret = -1; + } + FREE_NAME(); + } + + if( i_ret == 1 ) + i_ret = parse_playlist_node( p_demux, p_current_input, + p_xml_reader, "playlist" ) ? 0 : -1; + + int i; + for( i = 0 ; i < p_demux->p_sys->i_tracklist_entries ; i++ ) { - msg_Err( p_demux, "invalid root node name: %s", psz_name ); - i_ret = VLC_EGENERIC; + input_item_t *p_new_input = p_demux->p_sys->pp_tracklist[i]; + if( p_new_input ) + { + input_ItemAddSubItem( p_current_input, p_new_input ); + } } - FREE_NAME(); - i_ret = parse_playlist_node( p_demux, p_playlist, p_current, NULL, - p_xml_reader, "playlist" ); HANDLE_PLAY_AND_RELEASE; - if ( p_xml_reader ) + if( p_xml_reader ) xml_ReaderDelete( p_xml, p_xml_reader ); - if ( p_xml ) + if( p_xml ) xml_Delete( p_xml ); - - return i_ret; - return 0; + return i_ret; /* Needed for correct operation of go back */ } /** \brief dummy function for demux callback interface */ -int xspf_import_Control( demux_t *p_demux, int i_query, va_list args ) +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; } /** * \brief parse the root node of a XSPF playlist * \param p_demux demuxer instance - * \param p_playlist playlist instance - * \param p_item current playlist node + * \param p_input_item current input item * \param p_xml_reader xml reader instance * \param psz_element name of element to parse */ -static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE +static bool parse_playlist_node COMPLEX_INTERFACE { char *psz_name=NULL; char *psz_value=NULL; - vlc_bool_t b_version_found = VLC_FALSE; + bool b_version_found = false; int i_node; xml_elem_hnd_t *p_handler=NULL; xml_elem_hnd_t pl_elements[] = { {"title", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"creator", SIMPLE_CONTENT, {.smpl = set_item_info} }, - {"annotation", SIMPLE_CONTENT, {NULL} }, + {"annotation", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"info", SIMPLE_CONTENT, {NULL} }, {"location", SIMPLE_CONTENT, {NULL} }, {"identifier", SIMPLE_CONTENT, {NULL} }, - {"image", SIMPLE_CONTENT, {NULL} }, + {"image", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"date", SIMPLE_CONTENT, {NULL} }, {"license", SIMPLE_CONTENT, {NULL} }, {"attribution", COMPLEX_CONTENT, {.cmplx = skip_element} }, {"link", SIMPLE_CONTENT, {NULL} }, {"meta", SIMPLE_CONTENT, {NULL} }, - {"extension", COMPLEX_CONTENT, {.cmplx = skip_element} }, + {"extension", COMPLEX_CONTENT, {.cmplx = parse_extension_node} }, {"trackList", COMPLEX_CONTENT, {.cmplx = parse_tracklist_node} }, {NULL, UNKNOWN_CONTENT, {NULL} } }; /* read all playlist attributes */ - while ( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS ) + while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS ) { - psz_name = xml_ReaderName ( p_xml_reader ); - psz_value = xml_ReaderValue ( p_xml_reader ); - if ( !psz_name || !psz_value ) + psz_name = xml_ReaderName( p_xml_reader ); + psz_value = xml_ReaderValue( p_xml_reader ); + if( !psz_name || !psz_value ) { msg_Err( p_demux, "invalid xml stream @ " ); FREE_ATT(); - return VLC_FALSE; + return false; } /* attribute: version */ - if ( !strcmp( psz_name, "version" ) ) + if( !strcmp( psz_name, "version" ) ) { - b_version_found = VLC_TRUE; - if ( strcmp( psz_value, "0" ) && strcmp( psz_value, "1" ) ) + b_version_found = true; + if( strcmp( psz_value, "0" ) && strcmp( psz_value, "1" ) ) msg_Warn( p_demux, "unsupported XSPF version" ); } /* attribute: xmlns */ - else if ( !strcmp ( psz_name, "xmlns" ) ) + else if( !strcmp( psz_name, "xmlns" ) ) ; + else if( !strcmp( psz_name, "xml:base" ) ) + { + p_demux->p_sys->psz_base = decode_URI_duplicate( psz_value ); + } /* unknown attribute */ else msg_Warn( p_demux, "invalid attribute:\"%s\"", psz_name); @@ -193,45 +213,44 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE FREE_ATT(); } /* attribute version is mandatory !!! */ - if ( !b_version_found ) + if( !b_version_found ) msg_Warn( p_demux, " requires \"version\" attribute" ); /* parse the child elements - we only take care of */ - while ( xml_ReaderRead( p_xml_reader ) == 1 ) + while( xml_ReaderRead( p_xml_reader ) == 1 ) { i_node = xml_ReaderNodeType( p_xml_reader ); - switch ( i_node ) + switch( i_node ) { case XML_READER_NONE: break; case XML_READER_STARTELEM: /* element start tag */ psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name || !*psz_name ) + if( !psz_name || !*psz_name ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } /* choose handler */ for( p_handler = pl_elements; p_handler->name && strcmp( psz_name, p_handler->name ); p_handler++ ); - if ( !p_handler->name ) + if( !p_handler->name ) { msg_Err( p_demux, "unexpected element <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } FREE_NAME(); /* complex content is parsed in a separate function */ - if ( p_handler->type == COMPLEX_CONTENT ) + if( p_handler->type == COMPLEX_CONTENT ) { - if ( p_handler->pf_handler.cmplx( p_demux, - p_playlist, - p_item,NULL, - p_xml_reader, - p_handler->name ) ) + if( p_handler->pf_handler.cmplx( p_demux, + p_input_item, + p_xml_reader, + p_handler->name ) ) { p_handler = NULL; FREE_ATT(); @@ -239,7 +258,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE else { FREE_ATT(); - return VLC_FALSE; + return false; } } break; @@ -248,42 +267,42 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE /* simple element content */ FREE_ATT(); psz_value = xml_ReaderValue( p_xml_reader ); - if ( !psz_value ) + if( !psz_value ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } break; case XML_READER_ENDELEM: /* element end tag */ psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name ) + if( !psz_name ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } /* leave if the current parent node is terminated */ - if ( !strcmp( psz_name, psz_element ) ) + if( !strcmp( psz_name, psz_element ) ) { FREE_ATT(); - return VLC_TRUE; + return true; } /* there MUST have been a start tag for that element name */ - if ( !p_handler || !p_handler->name - || strcmp( p_handler->name, psz_name )) + if( !p_handler || !p_handler->name + || strcmp( p_handler->name, psz_name )) { msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } - if ( p_handler->pf_handler.smpl ) + if( p_handler->pf_handler.smpl ) { - p_handler->pf_handler.smpl( p_item, NULL, p_handler->name, + p_handler->pf_handler.smpl( p_input_item, p_handler->name, psz_value ); } FREE_ATT(); @@ -294,79 +313,80 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); FREE_ATT(); - return VLC_FALSE; + return false; } FREE_NAME(); } - return VLC_FALSE; + return false; } /** * \brief parses the tracklist node which only may contain s */ -static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE +static bool parse_tracklist_node COMPLEX_INTERFACE { + VLC_UNUSED(psz_element); char *psz_name=NULL; int i_node; int i_ntracks = 0; /* now parse the s */ - while ( xml_ReaderRead( p_xml_reader ) == 1 ) + while( xml_ReaderRead( p_xml_reader ) == 1 ) { i_node = xml_ReaderNodeType( p_xml_reader ); - if ( i_node == XML_READER_STARTELEM ) + if( i_node == XML_READER_STARTELEM ) { psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name ) + if( !psz_name ) { msg_Err( p_demux, "unexpected end of xml data" ); FREE_NAME(); - return VLC_FALSE; + return false; } - if ( strcmp( psz_name, "track") ) + if( strcmp( psz_name, "track") ) { msg_Err( p_demux, "unexpected child of : <%s>", psz_name ); FREE_NAME(); - return VLC_FALSE; + return false; } FREE_NAME(); /* parse the track data in a separate function */ - if ( parse_track_node( p_demux, p_playlist, p_item, NULL, - p_xml_reader,"track" ) == VLC_TRUE ) + if( parse_track_node( p_demux, p_input_item, + p_xml_reader,"track" ) == true ) i_ntracks++; } - else if ( i_node == XML_READER_ENDELEM ) + else if( i_node == XML_READER_ENDELEM ) break; } /* the has to be terminated */ - if ( xml_ReaderNodeType( p_xml_reader ) != XML_READER_ENDELEM ) + if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_ENDELEM ) { msg_Err( p_demux, "there's a missing " ); FREE_NAME(); - return VLC_FALSE; + return false; } psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name || strcmp( psz_name, "trackList" ) ) + if( !psz_name || strcmp( psz_name, "trackList" ) ) { msg_Err( p_demux, "expected: , found: ", psz_name ); FREE_NAME(); - return VLC_FALSE; + return false; } FREE_NAME(); msg_Dbg( p_demux, "parsed %i tracks successfully", i_ntracks ); - return VLC_TRUE; + return true; } /** * \brief parse one track element * \param COMPLEX_INTERFACE */ -static vlc_bool_t parse_track_node COMPLEX_INTERFACE +static bool parse_track_node COMPLEX_INTERFACE { input_item_t *p_new_input = NULL; int i_node; @@ -379,22 +399,22 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE {"identifier", SIMPLE_CONTENT, {NULL} }, {"title", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"creator", SIMPLE_CONTENT, {.smpl = set_item_info} }, - {"annotation", SIMPLE_CONTENT, {NULL} }, + {"annotation", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"info", SIMPLE_CONTENT, {NULL} }, - {"image", SIMPLE_CONTENT, {NULL} }, + {"image", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"album", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"trackNum", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"duration", SIMPLE_CONTENT, {.smpl = set_item_info} }, {"link", SIMPLE_CONTENT, {NULL} }, {"meta", SIMPLE_CONTENT, {NULL} }, - {"extension", COMPLEX_CONTENT, {.cmplx = skip_element} }, + {"extension", COMPLEX_CONTENT, {.cmplx = parse_extension_node} }, {NULL, UNKNOWN_CONTENT, {NULL} } }; - while ( xml_ReaderRead( p_xml_reader ) == 1 ) + while( xml_ReaderRead( p_xml_reader ) == 1 ) { i_node = xml_ReaderNodeType( p_xml_reader ); - switch ( i_node ) + switch( i_node ) { case XML_READER_NONE: break; @@ -402,39 +422,38 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE case XML_READER_STARTELEM: /* element start tag */ psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name || !*psz_name ) + if( !psz_name || !*psz_name ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } /* choose handler */ for( p_handler = track_elements; p_handler->name && strcmp( psz_name, p_handler->name ); p_handler++ ); - if ( !p_handler->name ) + if( !p_handler->name ) { msg_Err( p_demux, "unexpected element <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } FREE_NAME(); /* complex content is parsed in a separate function */ - if ( p_handler->type == COMPLEX_CONTENT ) + if( p_handler->type == COMPLEX_CONTENT ) { - if ( !p_new_input ) + if( !p_new_input ) { msg_Err( p_demux, "at <%s> level no new item has been allocated", p_handler->name ); FREE_ATT(); - return VLC_FALSE; + return false; } - if ( p_handler->pf_handler.cmplx( p_demux, - p_playlist, - NULL, p_new_input, - p_xml_reader, - p_handler->name ) ) + if( p_handler->pf_handler.cmplx( p_demux, + p_new_input, + p_xml_reader, + p_handler->name ) ) { p_handler = NULL; FREE_ATT(); @@ -442,7 +461,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE else { FREE_ATT(); - return VLC_FALSE; + return false; } } break; @@ -451,65 +470,91 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE /* simple element content */ FREE_ATT(); psz_value = xml_ReaderValue( p_xml_reader ); - if ( !psz_value ) + if( !psz_value ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } break; case XML_READER_ENDELEM: /* element end tag */ psz_name = xml_ReaderName( p_xml_reader ); - if ( !psz_name ) + if( !psz_name ) { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + return false; } /* leave if the current parent node is terminated */ - if ( !strcmp( psz_name, psz_element ) ) + if( !strcmp( psz_name, psz_element ) ) { FREE_ATT(); - /* Add it */ - playlist_AddWhereverNeeded( p_playlist, p_new_input, - p_item, p_demux->p_sys->p_item_in_category, - (p_demux->p_sys->i_parent_id >0 ) ? VLC_TRUE: - VLC_FALSE, PLAYLIST_APPEND ); - return VLC_TRUE; + if( p_demux->p_sys->i_identifier < + p_demux->p_sys->i_tracklist_entries ) + { + p_demux->p_sys->pp_tracklist[ + p_demux->p_sys->i_identifier ] = p_new_input; + } + else + { + if( p_demux->p_sys->i_identifier > + p_demux->p_sys->i_tracklist_entries ) + { + p_demux->p_sys->i_tracklist_entries = + p_demux->p_sys->i_identifier; + } + INSERT_ELEM( p_demux->p_sys->pp_tracklist, + p_demux->p_sys->i_tracklist_entries, + p_demux->p_sys->i_tracklist_entries, + p_new_input ); + } + return true; } /* there MUST have been a start tag for that element name */ - if ( !p_handler || !p_handler->name - || strcmp( p_handler->name, psz_name )) + if( !p_handler || !p_handler->name + || strcmp( p_handler->name, psz_name )) { msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } /* special case: location */ - if ( !strcmp( p_handler->name, "location" ) ) + if( !strcmp( p_handler->name, "location" ) ) { char *psz_uri=NULL; /* there MUST NOT be an item */ - if ( p_new_input ) + if( p_new_input ) { msg_Err( p_demux, "item <%s> already created", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } - psz_uri = unescape_URI_duplicate( psz_value ); + psz_uri = decode_URI_duplicate( psz_value ); - if ( psz_uri ) + if( psz_uri ) { - p_new_input = input_ItemNewExt( p_playlist, psz_uri, + if( p_demux->p_sys->psz_base && + !strstr( psz_uri, "://" ) ) + { + char* psz_tmp = malloc( + strlen(p_demux->p_sys->psz_base) + + strlen(psz_uri) +1 ); + if( !psz_tmp ) + return false; + sprintf( psz_tmp, "%s%s", + p_demux->p_sys->psz_base, psz_uri ); + free( psz_uri ); + psz_uri = psz_tmp; + } + p_new_input = input_ItemNewExt( p_demux, psz_uri, NULL, 0, NULL, -1 ); - p_new_input->p_meta = vlc_meta_New(); free( psz_uri ); - vlc_input_item_CopyOptions( p_item->p_input, p_new_input ); + input_ItemCopyOptions( p_input_item, p_new_input ); psz_uri = NULL; FREE_ATT(); p_handler = NULL; @@ -517,22 +562,26 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE else { FREE_ATT(); - return VLC_FALSE; + return false; } } + else if( !strcmp( p_handler->name, "identifier" ) ) + { + p_demux->p_sys->i_identifier = atoi( psz_value ); + } else { /* there MUST be an item */ - if ( !p_new_input ) + if( !p_new_input ) { msg_Err( p_demux, "item not yet created at <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + return false; } - if ( p_handler->pf_handler.smpl ) + if( p_handler->pf_handler.smpl ) { - p_handler->pf_handler.smpl( NULL, p_input, + p_handler->pf_handler.smpl( p_new_input, p_handler->name, psz_value ); FREE_ATT(); @@ -546,75 +595,353 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); FREE_ATT(); - return VLC_FALSE; + return false; } FREE_NAME(); } msg_Err( p_demux, "unexpected end of xml data" ); FREE_ATT(); - return VLC_FALSE; + return false; } /** * \brief handles the supported sub-elements */ -static vlc_bool_t set_item_info SIMPLE_INTERFACE +static bool set_item_info SIMPLE_INTERFACE { /* exit if setting is impossible */ - if ( !psz_name || !psz_value || !p_input ) - return VLC_FALSE; + if( !psz_name || !psz_value || !p_input ) + return false; + /* re-convert xml special characters inside psz_value */ - resolve_xml_special_chars ( psz_value ); + resolve_xml_special_chars( psz_value ); /* handle each info element in a separate "if" clause */ - if ( !strcmp( psz_name, "title" ) ) + if( !strcmp( psz_name, "title" ) ) { - p_input->psz_name = strdup( (char*)psz_value ); + input_item_SetTitle( p_input, psz_value ); } - else if ( !strcmp( psz_name, "creator" ) ) + else if( !strcmp( psz_name, "creator" ) ) { - vlc_meta_SetArtist( p_input->p_meta, psz_value ); + input_item_SetArtist( p_input, psz_value ); } - else if ( !strcmp( psz_name, "album" ) ) + else if( !strcmp( psz_name, "album" ) ) { - vlc_meta_SetAlbum( p_input->p_meta, psz_value ); + input_item_SetAlbum( p_input, psz_value ); } - else if ( !strcmp( psz_name, "trackNum" ) ) + else if( !strcmp( psz_name, "trackNum" ) ) { - vlc_meta_SetTracknum( p_input->p_meta, psz_value ); + input_item_SetTrackNum( p_input, psz_value ); } - else if ( !strcmp( psz_name, "duration" ) ) + else if( !strcmp( psz_name, "duration" ) ) { long i_num = atol( psz_value ); - p_input->i_duration = i_num*1000; + input_item_SetDuration( p_input, (mtime_t) i_num*1000 ); + } + else if( !strcmp( psz_name, "annotation" ) ) + { + input_item_SetDescription( p_input, psz_value ); + } + else if( !strcmp( psz_name, "image" ) ) + { + char *psz_uri = decode_URI_duplicate( psz_value ); + input_item_SetArtURL( p_input, psz_uri ); + free( psz_uri ); + } + return true; +} + +/** + * \brief handles the