X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fxspf.c;h=27bef7042de7777ec599108b3634617f5afbcf74;hb=0601ce56ed422cc56a63da6d8f3b0123dad340e0;hp=2d25a26ffcb08d6d7d5327c45c13142b9711bcf4;hpb=49a0cf38567f0ecd36ba3dff2c5cbe6b5be2fdde;p=vlc diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 2d25a26ffc..27bef7042d 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -63,15 +63,15 @@ int Import_xspf( vlc_object_t *p_this ) void Close_xspf( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; - int i; - for(i = 0; i < p_demux->p_sys->i_tracklist_entries; i++) + demux_sys_t *p_sys = p_demux->p_sys; + for( int i = 0; i < p_sys->i_tracklist_entries; i++ ) { - if(p_demux->p_sys->pp_tracklist[i]) - vlc_gc_decref( p_demux->p_sys->pp_tracklist[i] ); + if( p_sys->pp_tracklist[i] ) + vlc_gc_decref( p_sys->pp_tracklist[i] ); } - free( p_demux->p_sys->pp_tracklist ); - free( p_demux->p_sys->psz_base ); - free( p_demux->p_sys ); + free( p_sys->pp_tracklist ); + free( p_sys->psz_base ); + free( p_sys ); } /** @@ -83,7 +83,7 @@ int Demux( demux_t *p_demux ) xml_t *p_xml = NULL; 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_track_id = -1; @@ -113,11 +113,15 @@ int Demux( demux_t *p_demux ) 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 ); - i_ret = parse_playlist_node( p_demux, p_current_input, + 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++ ) @@ -125,12 +129,14 @@ int Demux( demux_t *p_demux ) input_item_t *p_new_input = p_demux->p_sys->pp_tracklist[i]; if( p_new_input ) { - input_item_AddSubItem( p_current_input, p_new_input ); + input_item_node_AppendItem( p_subitems, p_new_input ); } } + input_item_node_PostAndDelete( p_subitems ); + end: - HANDLE_PLAY_AND_RELEASE; + vlc_gc_decref(p_current_input); if( p_xml_reader ) xml_ReaderDelete( p_xml, p_xml_reader ); if( p_xml ) @@ -154,6 +160,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) */ static bool parse_playlist_node COMPLEX_INTERFACE { + input_item_t *p_input_item = p_input_node->p_item; char *psz_name = NULL; char *psz_value = NULL; bool b_version_found = false; @@ -247,7 +254,7 @@ static bool parse_playlist_node COMPLEX_INTERFACE { FREE_VALUE(); if( p_handler->pf_handler.cmplx( p_demux, - p_input_item, + p_input_node, p_xml_reader, p_handler->name ) ) { @@ -348,8 +355,8 @@ static bool parse_tracklist_node COMPLEX_INTERFACE free( psz_eltname ); /* parse the track data in a separate function */ - if( parse_track_node( p_demux, p_input_item, p_xml_reader, - "track" ) ) + if( parse_track_node( p_demux, p_input_node, + p_xml_reader, "track" ) ) i_ntracks++; } else if( i_node == XML_READER_ENDELEM ) @@ -381,10 +388,12 @@ static bool parse_tracklist_node COMPLEX_INTERFACE */ static bool parse_track_node COMPLEX_INTERFACE { - int i_node; + 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} }, @@ -404,6 +413,7 @@ static bool parse_track_node COMPLEX_INTERFACE }; 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 ) { @@ -412,11 +422,11 @@ static bool parse_track_node COMPLEX_INTERFACE } /* reset i_track_id */ - p_demux->p_sys->i_track_id = -1; + 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: @@ -428,8 +438,7 @@ static bool parse_track_node COMPLEX_INTERFACE if( !psz_name || !*psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return false; + goto end; } /* choose handler */ for( p_handler = track_elements; @@ -438,32 +447,24 @@ static bool parse_track_node COMPLEX_INTERFACE if( !p_handler->name ) { msg_Err( p_demux, "unexpected element <%s>", psz_name ); - FREE_ATT(); - return 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 false; - } - if( p_handler->pf_handler.cmplx( p_demux, - 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 false; } } @@ -471,13 +472,12 @@ static bool parse_track_node COMPLEX_INTERFACE 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 false; + goto end; } break; @@ -487,14 +487,14 @@ static bool parse_track_node COMPLEX_INTERFACE if( !psz_name ) { msg_Err( p_demux, "invalid xml stream" ); - FREE_ATT(); - return false; + goto end; } /* leave if the current parent node is terminated */ if( !strcmp( psz_name, psz_element ) ) { - FREE_ATT(); + free( psz_name ); + free( psz_value ); /* Make sure we have a URI */ char *psz_uri = input_item_GetURI( p_new_input ); @@ -504,29 +504,26 @@ static bool parse_track_node COMPLEX_INTERFACE } free( psz_uri ); - if( p_demux->p_sys->i_track_id < 0 ) + if( p_sys->i_track_id < 0 ) { - input_item_AddSubItem( p_input_item, p_new_input ); + input_item_node_AppendNode( p_input_node, p_new_node ); vlc_gc_decref( p_new_input ); return true; } - if( p_demux->p_sys->i_track_id >= - p_demux->p_sys->i_tracklist_entries ) + if( p_sys->i_track_id >= p_sys->i_tracklist_entries ) { input_item_t **pp; - pp = realloc( p_demux->p_sys->pp_tracklist, - (p_demux->p_sys->i_track_id + 1) * sizeof(*pp) ); + pp = realloc( p_sys->pp_tracklist, + (p_sys->i_track_id + 1) * sizeof(*pp) ); if( !pp ) return false; - p_demux->p_sys->pp_tracklist = pp; - while( p_demux->p_sys->i_track_id >= - p_demux->p_sys->i_tracklist_entries ) - pp[p_demux->p_sys->i_tracklist_entries++] = NULL; + p_sys->pp_tracklist = pp; + while( p_sys->i_track_id >= p_sys->i_tracklist_entries ) + pp[p_sys->i_tracklist_entries++] = NULL; } - p_demux->p_sys->pp_tracklist[ - p_demux->p_sys->i_track_id ] = p_new_input; + 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 */ @@ -535,13 +532,15 @@ static bool parse_track_node COMPLEX_INTERFACE { msg_Err( p_demux, "there's no open element left for <%s>", psz_name ); - FREE_ATT(); - return false; + goto end; } /* special case: location */ if( !strcmp( p_handler->name, "location" ) ) { + 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 @@ -549,14 +548,13 @@ static bool parse_track_node COMPLEX_INTERFACE * Last, psz_base should default to the XSPF resource * location if missing (not the current working directory). * -- Courmisch */ - if( p_demux->p_sys->psz_base && !strstr( psz_value, "://" ) ) + if( p_sys->psz_base && !strstr( psz_value, "://" ) ) { char* psz_tmp; - if( asprintf( &psz_tmp, "%s%s", - p_demux->p_sys->psz_base, psz_value ) == -1 ) + if( asprintf( &psz_tmp, "%s%s", p_sys->psz_base, + psz_value ) == -1 ) { - FREE_ATT(); - return NULL; + goto end; } input_item_SetURI( p_new_input, psz_tmp ); free( psz_tmp ); @@ -564,19 +562,10 @@ static bool parse_track_node COMPLEX_INTERFACE else input_item_SetURI( p_new_input, psz_value ); input_item_CopyOptions( p_input_item, p_new_input ); - FREE_ATT(); - p_handler = NULL; } 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 false; - } if( p_handler->pf_handler.smpl ) { p_handler->pf_handler.smpl( p_new_input, @@ -592,14 +581,15 @@ static bool parse_track_node COMPLEX_INTERFACE default: /* unknown/unexpected xml node */ msg_Err( p_demux, "unexpected xml node %i", i_node ); - FREE_ATT(); - return false; + goto end; } - FREE_NAME(); } msg_Err( p_demux, "unexpected end of xml data" ); - FREE_ATT(); - return false; + +end: + free( psz_name ); + free( psz_value ); + return b_ret; } /** @@ -670,6 +660,7 @@ static bool set_option SIMPLE_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; @@ -733,7 +724,8 @@ static bool parse_extension_node COMPLEX_INTERFACE ITEM_TYPE_DIRECTORY ); if( p_new_input ) { - input_item_AddSubItem( 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; } @@ -746,15 +738,33 @@ static bool parse_extension_node COMPLEX_INTERFACE msg_Warn( p_demux, " requires \"application\" attribute" ); 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 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 ) { @@ -789,7 +799,7 @@ static bool parse_extension_node COMPLEX_INTERFACE if( p_handler->type == COMPLEX_CONTENT ) { if( p_handler->pf_handler.cmplx( p_demux, - p_input_item, + p_input_node, p_xml_reader, p_handler->name ) ) { @@ -923,7 +933,7 @@ static bool parse_extitem_node COMPLEX_INTERFACE p_new_input = p_demux->p_sys->pp_tracklist[ i_tid ]; if( p_new_input ) { - input_item_AddSubItem( 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; } @@ -940,7 +950,7 @@ static bool parse_extitem_node COMPLEX_INTERFACE */ static bool skip_element COMPLEX_INTERFACE { - VLC_UNUSED(p_demux); VLC_UNUSED(p_input_item); + VLC_UNUSED(p_demux); VLC_UNUSED(p_input_node); while( xml_ReaderRead( p_xml_reader ) == 1 ) {