Commit 90113034 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

fix #1409

parent 04022ec3
......@@ -120,6 +120,15 @@ int Demux( demux_t *p_demux )
i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input,
p_xml_reader, "playlist" ) ? 0 : -1;
int i;
for( 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 )
{
input_ItemAddSubItem( p_current_input, p_new_input );
}
}
HANDLE_PLAY_AND_RELEASE;
if( p_xml_reader )
......@@ -882,9 +891,10 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
if( p_new_input )
{
input_ItemAddSubItem( p_input_item, p_new_input );
p_demux->p_sys->pp_tracklist[i_href] = 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 );
......
......@@ -25,9 +25,11 @@
#define FREE_VALUE() if (psz_value) {free(psz_value);psz_value=NULL;}
#define FREE_ATT() FREE_NAME();FREE_VALUE()
#define UNKNOWN_CONTENT 0
#define SIMPLE_CONTENT 1
#define COMPLEX_CONTENT 2
enum {
UNKNOWN_CONTENT,
SIMPLE_CONTENT,
COMPLEX_CONTENT
};
#define SIMPLE_INTERFACE (input_item_t *p_input,\
const char *psz_name,\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment