X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fxspf.c;h=ed6f135f69c88b33944d2f9079e5fb614cff246e;hb=15172e6867ea91a40628edea89dce5d4d7039d79;hp=2180228478a5018cc9d7c3b3df68910987748044;hpb=b41dd1fee6525c2b6375ec3b623d5262dffadf59;p=vlc diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 2180228478..ed6f135f69 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -20,27 +20,30 @@ * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include -#include "playlist.h" -#include "vlc_xml.h" -#include "vlc_strings.h" -#include "vlc_url.h" +#include +#include +#include #include "xspf.h" +#include "playlist.h" struct demux_sys_t { - playlist_item_t *p_item_in_category; input_item_t **pp_tracklist; int i_tracklist_entries; - int i_identifier; + int i_track_id; char * psz_base; }; @@ -50,19 +53,25 @@ static int Demux( demux_t * ); /** * \brief XSPF submodule initialization function */ -int E_(Import_xspf)( vlc_object_t *p_this ) +int Import_xspf( vlc_object_t *p_this ) { DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".xspf", "xspf-open", "using XSPF playlist reader" ); return VLC_SUCCESS; } -void E_(Close_xspf)( vlc_object_t *p_this ) +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 ); + demux_sys_t *p_sys = p_demux->p_sys; + for( int i = 0; i < p_sys->i_tracklist_entries; i++ ) + { + if( p_sys->pp_tracklist[i] ) + vlc_gc_decref( p_sys->pp_tracklist[i] ); + } + free( p_sys->pp_tracklist ); + free( p_sys->psz_base ); + free( p_sys ); } /** @@ -70,83 +79,87 @@ void E_(Close_xspf)( vlc_object_t *p_this ) */ int Demux( demux_t *p_demux ) { - int i_ret = VLC_SUCCESS; - xml_t *p_xml = NULL; + int i_ret = -1; xml_reader_t *p_xml_reader = NULL; char *psz_name = NULL; - INIT_PLAYLIST_STUFF; + input_item_t *p_current_input = GetCurrentItem(p_demux); 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->i_track_id = -1; 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; - else - { - p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s ); - if( !p_xml_reader ) - i_ret = VLC_EGENERIC; - } + p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s ); + if( !p_xml_reader ) + goto end; /* locating the root node */ - if( i_ret == VLC_SUCCESS ) + do { - do + if( xml_ReaderRead( p_xml_reader ) != 1 ) { - if( xml_ReaderRead( p_xml_reader ) != 1 ) - { - msg_Err( p_demux, "can't read xml stream" ); - i_ret = VLC_EGENERIC; - } - } while( i_ret == VLC_SUCCESS && - xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ); - } + msg_Err( p_demux, "can't read xml stream" ); + goto end; + } + } while( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ); + /* checking root node name */ - if( i_ret == VLC_SUCCESS ) + psz_name = xml_ReaderName( p_xml_reader ); + if( !psz_name || strcmp( psz_name, "playlist" ) ) { - psz_name = xml_ReaderName( p_xml_reader ); - if( !psz_name || strcmp( psz_name, "playlist" ) ) + msg_Err( p_demux, "invalid root node name: %s", psz_name ); + free( psz_name ); + goto end; + } + free( psz_name ); + + input_item_node_t *p_subitems = + input_item_node_Create( p_current_input ); + + i_ret = parse_playlist_node( p_demux, p_subitems, + p_xml_reader, "playlist" ) ? 0 : -1; + + for( int i = 0 ; i < p_demux->p_sys->i_tracklist_entries ; i++ ) + { + input_item_t *p_new_input = p_demux->p_sys->pp_tracklist[i]; + if( p_new_input ) { - msg_Err( p_demux, "invalid root node name: %s", psz_name ); - i_ret = VLC_EGENERIC; + input_item_node_AppendItem( p_subitems, p_new_input ); } - FREE_NAME(); } - i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input, - p_xml_reader, "playlist" ); - HANDLE_PLAY_AND_RELEASE; + input_item_node_PostAndDelete( p_subitems ); + +end: + vlc_gc_decref(p_current_input); if( p_xml_reader ) - xml_ReaderDelete( p_xml, p_xml_reader ); - if( p_xml ) - xml_Delete( p_xml ); - return -1; /* Needed for correct operation of go back */ + xml_ReaderDelete( p_xml_reader ); + return i_ret; /* Needed for correct operation of go back */ } /** \brief dummy function for demux callback interface */ 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_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; + input_item_t *p_input_item = p_input_node->p_item; + char *psz_name = NULL; + char *psz_value = NULL; + bool b_version_found = false; int i_node; - xml_elem_hnd_t *p_handler=NULL; + bool b_ret = false; + xml_elem_hnd_t *p_handler = NULL; xml_elem_hnd_t pl_elements[] = { {"title", SIMPLE_CONTENT, {.smpl = set_item_info} }, @@ -174,34 +187,36 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE if( !psz_name || !psz_value ) { msg_Err( p_demux, "invalid xml stream @ " ); - FREE_ATT(); - return VLC_FALSE; + goto end; } /* attribute: version */ if( !strcmp( psz_name, "version" ) ) { - b_version_found = VLC_TRUE; + 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" ) || !strcmp( psz_name, "xmlns:vlc" ) ) ; else if( !strcmp( psz_name, "xml:base" ) ) { - p_demux->p_sys->psz_base = decode_URI_duplicate( psz_value ); + p_demux->p_sys->psz_base = strdup( psz_value ); } /* unknown attribute */ else msg_Warn( p_demux, "invalid attribute:\"%s\"", psz_name); - FREE_ATT(); + free( psz_name ); + free( psz_value ); } /* attribute version is mandatory !!! */ if( !b_version_found ) msg_Warn( p_demux, " requires \"version\" attribute" ); /* parse the child elements - we only take care of */ + psz_name = NULL; + psz_value = NULL; while( xml_ReaderRead( p_xml_reader ) == 1 ) { i_node = xml_ReaderNodeType( p_xml_reader ); @@ -215,8 +230,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE if( !psz_name || !*psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } /* choose handler */ for( p_handler = pl_elements; @@ -225,39 +239,35 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE if( !p_handler->name ) { msg_Err( p_demux, "unexpected element <%s>", psz_name ); - FREE_ATT(); - return VLC_FALSE; + goto end; } FREE_NAME(); /* complex content is parsed in a separate function */ if( p_handler->type == COMPLEX_CONTENT ) { + FREE_VALUE(); if( p_handler->pf_handler.cmplx( p_demux, - p_playlist, - p_input_item, + p_input_node, p_xml_reader, p_handler->name ) ) { p_handler = NULL; - FREE_ATT(); } else { - FREE_ATT(); - return VLC_FALSE; + return false; } } break; case XML_READER_TEXT: /* simple element content */ - FREE_ATT(); + free( psz_value ); psz_value = xml_ReaderValue( p_xml_reader ); if( !psz_value ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } break; @@ -267,14 +277,13 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE if( !psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } /* leave if the current parent node is terminated */ if( !strcmp( psz_name, psz_element ) ) { - FREE_ATT(); - return VLC_TRUE; + b_ret = true; + goto end; } /* there MUST have been a start tag for that element name */ if( !p_handler || !p_handler->name @@ -282,8 +291,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE { msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); - FREE_ATT(); - return VLC_FALSE; + goto end; } if( p_handler->pf_handler.smpl ) @@ -298,48 +306,50 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE default: /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); - FREE_ATT(); - return VLC_FALSE; + goto end; } - FREE_NAME(); } - return VLC_FALSE; + +end: + free( psz_name ); + free( psz_value ); + return b_ret; } /** * \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 { - char *psz_name=NULL; - int i_node; + VLC_UNUSED(psz_element); + char *psz_name; int i_ntracks = 0; /* now parse the s */ while( xml_ReaderRead( p_xml_reader ) == 1 ) { - i_node = xml_ReaderNodeType( p_xml_reader ); + int i_node = xml_ReaderNodeType( p_xml_reader ); if( i_node == XML_READER_STARTELEM ) { - psz_name = xml_ReaderName( p_xml_reader ); - if( !psz_name ) + char *psz_eltname = xml_ReaderName( p_xml_reader ); + if( !psz_eltname ) { msg_Err( p_demux, "unexpected end of xml data" ); - FREE_NAME(); - return VLC_FALSE; + free( psz_eltname ); + return false; } - if( strcmp( psz_name, "track") ) + if( strcmp( psz_eltname, "track") ) { msg_Err( p_demux, "unexpected child of : <%s>", - psz_name ); - FREE_NAME(); - return VLC_FALSE; + psz_eltname ); + free( psz_eltname ); + return false; } - FREE_NAME(); + free( psz_eltname ); /* parse the track data in a separate function */ - if( parse_track_node( p_demux, p_playlist, p_input_item, - p_xml_reader,"track" ) == VLC_TRUE ) + if( parse_track_node( p_demux, p_input_node, + p_xml_reader, "track" ) ) i_ntracks++; } else if( i_node == XML_READER_ENDELEM ) @@ -350,34 +360,33 @@ static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE 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" ) ) { msg_Err( p_demux, "expected: , found: ", psz_name ); - FREE_NAME(); - return VLC_FALSE; + free( psz_name ); + return false; } - FREE_NAME(); + free( psz_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; - char *psz_name=NULL; - char *psz_value=NULL; - xml_elem_hnd_t *p_handler=NULL; + input_item_t *p_input_item = p_input_node->p_item; + char *psz_name = NULL; + char *psz_value = NULL; + xml_elem_hnd_t *p_handler = NULL; + demux_sys_t *p_sys = p_demux->p_sys; + bool b_ret = false; xml_elem_hnd_t track_elements[] = { {"location", SIMPLE_CONTENT, {NULL} }, @@ -392,13 +401,25 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE {"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} } }; + input_item_t *p_new_input = input_item_New( p_demux, NULL, NULL ); + input_item_node_t *p_new_node = input_item_node_Create( p_new_input ); + + if( !p_new_input ) + { + /* malloc has failed for input_item_New, so bailout early */ + return false; + } + + /* reset i_track_id */ + p_sys->i_track_id = -1; + while( xml_ReaderRead( p_xml_reader ) == 1 ) { - i_node = xml_ReaderNodeType( p_xml_reader ); + int i_node = xml_ReaderNodeType( p_xml_reader ); switch( i_node ) { case XML_READER_NONE: @@ -410,8 +431,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE if( !psz_name || !*psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } /* choose handler */ for( p_handler = track_elements; @@ -420,47 +440,37 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE if( !p_handler->name ) { msg_Err( p_demux, "unexpected element <%s>", psz_name ); - FREE_ATT(); - return VLC_FALSE; + goto end; } FREE_NAME(); /* complex content is parsed in a separate function */ if( p_handler->type == COMPLEX_CONTENT ) { - 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; - } - if( p_handler->pf_handler.cmplx( p_demux, - p_playlist, - p_new_input, - p_xml_reader, - p_handler->name ) ) + FREE_VALUE(); + + bool b_res = p_handler->pf_handler.cmplx( p_demux, + p_new_node, + p_xml_reader, + p_handler->name ); + if( b_res ) { p_handler = NULL; - FREE_ATT(); } else { - FREE_ATT(); - return VLC_FALSE; + return false; } } break; case XML_READER_TEXT: /* simple element content */ - FREE_ATT(); + free( psz_value ); psz_value = xml_ReaderValue( p_xml_reader ); if( !psz_value ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } break; @@ -470,33 +480,44 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE if( !psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return VLC_FALSE; + goto end; } + /* leave if the current parent node is terminated */ if( !strcmp( psz_name, psz_element ) ) { - FREE_ATT(); - if( p_demux->p_sys->i_identifier < - p_demux->p_sys->i_tracklist_entries ) + free( psz_name ); + free( psz_value ); + + /* Make sure we have a URI */ + char *psz_uri = input_item_GetURI( p_new_input ); + if( !psz_uri ) { - p_demux->p_sys->pp_tracklist[ - p_demux->p_sys->i_identifier ] = p_new_input; + input_item_SetURI( p_new_input, "vlc://nop" ); } - else + free( psz_uri ); + + if( p_sys->i_track_id < 0 ) { - 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 ); + input_item_node_AppendNode( p_input_node, p_new_node ); + vlc_gc_decref( p_new_input ); + return true; + } + + if( p_sys->i_track_id >= p_sys->i_tracklist_entries ) + { + input_item_t **pp; + pp = realloc( p_sys->pp_tracklist, + (p_sys->i_track_id + 1) * sizeof(*pp) ); + if( !pp ) + return false; + p_sys->pp_tracklist = pp; + while( p_sys->i_track_id >= p_sys->i_tracklist_entries ) + pp[p_sys->i_tracklist_entries++] = NULL; } - return VLC_TRUE; + + p_sys->pp_tracklist[ p_sys->i_track_id ] = p_new_input; + return true; } /* there MUST have been a start tag for that element name */ if( !p_handler || !p_handler->name @@ -504,70 +525,40 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE { msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); - FREE_ATT(); - return VLC_FALSE; + goto end; } /* special case: location */ if( !strcmp( p_handler->name, "location" ) ) { - char *psz_uri=NULL; - /* there MUST NOT be an item */ - if( p_new_input ) - { - msg_Err( p_demux, "item <%s> already created", - psz_name ); - FREE_ATT(); - return VLC_FALSE; - } - psz_uri = decode_URI_duplicate( psz_value ); - - if( psz_uri ) + if( psz_value == NULL ) + input_item_SetURI( p_new_input, "vlc://nop" ); + else + /* FIXME: This is broken. Scheme-relative (//...) locations + * and anchors (#...) are not resolved correctly. Also, + * host-relative (/...) and directory-relative locations + * ("relative path" in vernacular) should be resolved. + * Last, psz_base should default to the XSPF resource + * location if missing (not the current working directory). + * -- Courmisch */ + if( p_sys->psz_base && !strstr( psz_value, "://" ) ) { - if( p_demux->p_sys->psz_base && - !strstr( psz_uri, "://" ) ) + char* psz_tmp; + if( asprintf( &psz_tmp, "%s%s", p_sys->psz_base, + psz_value ) == -1 ) { - char* psz_tmp = malloc( - strlen(p_demux->p_sys->psz_base) + - strlen(psz_uri) +1 ); - if( !psz_tmp ) - { - msg_Err( p_demux, "out of memory"); - return VLC_FALSE; - } - sprintf( psz_tmp, "%s%s", - p_demux->p_sys->psz_base, psz_uri ); - free( psz_uri ); - psz_uri = psz_tmp; + goto end; } - p_new_input = input_ItemNewExt( p_playlist, psz_uri, - NULL, 0, NULL, -1 ); - free( psz_uri ); - input_ItemCopyOptions( p_input_item, p_new_input ); - psz_uri = NULL; - FREE_ATT(); - p_handler = NULL; + input_item_SetURI( p_new_input, psz_tmp ); + free( psz_tmp ); } else - { - FREE_ATT(); - return VLC_FALSE; - } - } - else if( !strcmp( p_handler->name, "identifier" ) ) - { - p_demux->p_sys->i_identifier = atoi( psz_value ); + input_item_SetURI( p_new_input, psz_value ); + input_item_CopyOptions( p_input_item, p_new_input ); } else { /* there MUST be an item */ - if( !p_new_input ) - { - msg_Err( p_demux, "item not yet created at <%s>", - psz_name ); - FREE_ATT(); - return VLC_FALSE; - } if( p_handler->pf_handler.smpl ) { p_handler->pf_handler.smpl( p_new_input, @@ -583,25 +574,25 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE default: /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); - FREE_ATT(); - return VLC_FALSE; + goto end; } - FREE_NAME(); } msg_Err( p_demux, "unexpected end of xml data" ); - FREE_ATT(); - return VLC_FALSE; + +end: + free( psz_name ); + free( psz_value ); + return b_ret; } /** * \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; - + return false; /* re-convert xml special characters inside psz_value */ resolve_xml_special_chars( psz_value ); @@ -635,30 +626,48 @@ static vlc_bool_t set_item_info SIMPLE_INTERFACE } else if( !strcmp( psz_name, "image" ) ) { - char *psz_uri = decode_URI_duplicate( psz_value ); - input_item_SetArtURL( p_input, psz_uri ); - free( psz_uri ); + input_item_SetArtURL( p_input, psz_value ); } - return VLC_TRUE; + return true; } +/** + * \brief handles the elements + */ +static bool set_option SIMPLE_INTERFACE +{ + /* exit if setting is impossible */ + if( !psz_name || !psz_value || !p_input ) + return false; + + /* re-convert xml special characters inside psz_value */ + resolve_xml_special_chars( psz_value ); + + input_item_AddOption( p_input, psz_value, 0 ); + + return true; +} /** * \brief parse the extension node of a XSPF playlist */ -static vlc_bool_t parse_extension_node COMPLEX_INTERFACE +static bool parse_extension_node COMPLEX_INTERFACE { + input_item_t *p_input_item = p_input_node->p_item; char *psz_name = NULL; char *psz_value = NULL; char *psz_title = NULL; char *psz_application = NULL; int i_node; + bool b_release_input_item = false; xml_elem_hnd_t *p_handler = NULL; input_item_t *p_new_input = NULL; xml_elem_hnd_t pl_elements[] = - { {"node", COMPLEX_CONTENT, {.cmplx = parse_extension_node} }, - {"item", COMPLEX_CONTENT, {.cmplx = parse_extitem_node} }, + { {"vlc:node", COMPLEX_CONTENT, {.cmplx = parse_extension_node} }, + {"vlc:item", COMPLEX_CONTENT, {.cmplx = parse_extitem_node} }, + {"vlc:id", SIMPLE_CONTENT, {NULL} }, + {"vlc:option", SIMPLE_CONTENT, {.smpl = set_option} }, {NULL, UNKNOWN_CONTENT, {NULL} } }; @@ -669,42 +678,49 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE psz_value = xml_ReaderValue( p_xml_reader ); if( !psz_name || !psz_value ) { - msg_Err( p_demux, "invalid xml stream @ " ); + msg_Err( p_demux, "invalid xml stream @ " ); FREE_ATT(); - return VLC_FALSE; + return false; } /* attribute: title */ if( !strcmp( psz_name, "title" ) ) { resolve_xml_special_chars( psz_value ); - psz_title = strdup( psz_value ); + psz_title = psz_value; } /* extension attribute: application */ else if( !strcmp( psz_name, "application" ) ) { - psz_application = strdup( psz_value ); + psz_application = psz_value; } /* unknown attribute */ else - msg_Warn( p_demux, "invalid <%s> attribute:\"%s\"", psz_element, psz_name ); - - FREE_ATT(); + { + msg_Warn( p_demux, "invalid <%s> attribute:\"%s\"", psz_element, + psz_name ); + FREE_VALUE(); + } + FREE_NAME(); + psz_value = NULL; } /* attribute title is mandatory except for */ - if( !strcmp( psz_element, "node" ) ) + if( !strcmp( psz_element, "vlc:node" ) ) { if( !psz_title ) { - msg_Warn( p_demux, " requires \"title\" attribute" ); - return VLC_FALSE; + msg_Warn( p_demux, " requires \"title\" attribute" ); + return false; } - p_new_input = input_ItemNewWithType( VLC_OBJECT( p_playlist ), "vlc:skip", - psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY ); + p_new_input = input_item_NewWithType( VLC_OBJECT( p_demux ), + "vlc://nop", psz_title, 0, NULL, 0, -1, + ITEM_TYPE_DIRECTORY ); if( p_new_input ) { - input_ItemAddSubItem( p_input_item, p_new_input ); + p_input_node = + input_item_node_AppendItem( p_input_node, p_new_input ); p_input_item = p_new_input; + b_release_input_item = true; } free( psz_title ); } @@ -713,17 +729,35 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE if( !psz_application ) { msg_Warn( p_demux, " requires \"application\" attribute" ); - return VLC_FALSE; + return false; } + /* Skip the extension if the application is not vlc + This will skip all children of the current node */ else if( strcmp( psz_application, "http://www.videolan.org/vlc/playlist/0" ) ) { msg_Dbg( p_demux, "Skipping \"%s\" extension tag", psz_application ); free( psz_application ); - return VLC_FALSE; + /* Skip all children */ + while( xml_ReaderRead( p_xml_reader ) == 1 ) + { + if( xml_ReaderNodeType( p_xml_reader ) == XML_READER_ENDELEM ) + { + char *psz_name = xml_ReaderName( p_xml_reader ); + if( !strcmp( psz_name, "extension" ) ) + { + free( psz_name ); + break; + } + msg_Dbg( p_demux, "\tskipping \"%s\" extension child", psz_name ); + free( psz_name ); + } + } + return true; } } free( psz_application ); + /* parse the child elements */ while( xml_ReaderRead( p_xml_reader ) == 1 ) { @@ -739,7 +773,8 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } /* choose handler */ for( p_handler = pl_elements; @@ -749,15 +784,15 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE { msg_Err( p_demux, "unexpected element <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } FREE_NAME(); /* complex content is parsed in a separate function */ if( p_handler->type == COMPLEX_CONTENT ) { if( p_handler->pf_handler.cmplx( p_demux, - p_playlist, - p_input_item, + p_input_node, p_xml_reader, p_handler->name ) ) { @@ -767,7 +802,8 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE else { FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } } break; @@ -780,7 +816,8 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } break; @@ -791,13 +828,15 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE { msg_Err( p_demux, "invalid xml stream" ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } /* leave if the current parent node is terminated */ if( !strcmp( psz_name, psz_element ) ) { FREE_ATT(); - return VLC_TRUE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return true; } /* there MUST have been a start tag for that element name */ if( !p_handler || !p_handler->name @@ -806,10 +845,16 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } - if( p_handler->pf_handler.smpl ) + /* special tag */ + if( !strcmp( p_handler->name, "vlc:id" ) ) + { + p_demux->p_sys->i_track_id = atoi( psz_value ); + } + else if( p_handler->pf_handler.smpl ) { p_handler->pf_handler.smpl( p_input_item, p_handler->name, psz_value ); @@ -822,94 +867,99 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); FREE_ATT(); - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } FREE_NAME(); } - return VLC_FALSE; + if( b_release_input_item ) vlc_gc_decref( p_new_input ); + return false; } /** * \brief parse the extension item node of a XSPF playlist */ -static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE +static bool parse_extitem_node COMPLEX_INTERFACE { + VLC_UNUSED(psz_element); input_item_t *p_new_input = NULL; - char *psz_name = NULL; - char *psz_value = NULL; - int i_href = -1; + int i_tid = -1; /* read all extension item attributes */ while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS ) { - psz_name = xml_ReaderName( p_xml_reader ); - psz_value = xml_ReaderValue( p_xml_reader ); + char *psz_name = xml_ReaderName( p_xml_reader ); + char *psz_value = xml_ReaderValue( p_xml_reader ); if( !psz_name || !psz_value ) { - msg_Err( p_demux, "invalid xml stream @ " ); - FREE_ATT(); - return VLC_FALSE; + msg_Err( p_demux, "invalid xml stream @ " ); + free( psz_name ); + free( psz_value ); + return false; } /* attribute: href */ - if( !strcmp( psz_name, "href" ) ) + if( !strcmp( psz_name, "tid" ) ) { - i_href = atoi( psz_value ); + i_tid = atoi( psz_value ); } /* unknown attribute */ else - msg_Warn( p_demux, "invalid attribute:\"%s\"", psz_name); + msg_Warn( p_demux, "invalid attribute:\"%s\"", psz_name); - FREE_ATT(); + free( psz_name ); + free( psz_value ); } /* attribute href is mandatory */ - if( i_href < 0 ) + if( i_tid < 0 ) { - msg_Warn( p_demux, " requires \"href\" attribute" ); - return VLC_FALSE; + msg_Warn( p_demux, " requires \"tid\" attribute" ); + return false; } - if( i_href >= p_demux->p_sys->i_tracklist_entries ) + if( i_tid >= p_demux->p_sys->i_tracklist_entries ) { - msg_Warn( p_demux, "invalid \"href\" attribute" ); - return VLC_FALSE; + msg_Warn( p_demux, "invalid \"tid\" attribute" ); + return false; } - p_new_input = p_demux->p_sys->pp_tracklist[ i_href ]; + p_new_input = p_demux->p_sys->pp_tracklist[ i_tid ]; if( p_new_input ) { - input_ItemAddSubItem( p_input_item, p_new_input ); + input_item_node_AppendItem( p_input_node, p_new_input ); + vlc_gc_decref( p_new_input ); + p_demux->p_sys->pp_tracklist[i_tid] = NULL; } - /* fix for #1293 - XTAG sends ENDELEM for self closing tag */ + /* kludge for #1293 - XTAG sends ENDELEM for self closing tag */ /* (libxml sends NONE) */ xml_ReaderRead( p_xml_reader ); - return VLC_TRUE; + return true; } /** * \brief skips complex element content that we can't manage */ -static vlc_bool_t skip_element COMPLEX_INTERFACE +static bool skip_element COMPLEX_INTERFACE { - char *psz_endname; + VLC_UNUSED(p_demux); VLC_UNUSED(p_input_node); while( xml_ReaderRead( p_xml_reader ) == 1 ) { if( xml_ReaderNodeType( p_xml_reader ) == XML_READER_ENDELEM ) { - psz_endname = xml_ReaderName( p_xml_reader ); + char *psz_endname = xml_ReaderName( p_xml_reader ); if( !psz_endname ) - return VLC_FALSE; + return false; if( !strcmp( psz_element, psz_endname ) ) { free( psz_endname ); - return VLC_TRUE; + return true; } else free( psz_endname ); } } - return VLC_FALSE; + return false; }