#include "playlist.h"
#include <vlc_xml.h>
-struct demux_sys_t
-{
- xml_t *p_xml;
- xml_reader_t *p_xml_reader;
-};
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
if( !demux_IsForced( p_demux, "podcast" ) )
return VLC_EGENERIC;
- STANDARD_DEMUX_INIT_MSG( "using podcast reader" );
- p_demux->p_sys->p_xml = NULL;
- p_demux->p_sys->p_xml_reader = NULL;
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ msg_Dbg( p_demux, "using podcast reader" );
return VLC_SUCCESS;
}
*****************************************************************************/
void Close_podcast( vlc_object_t *p_this )
{
- demux_t *p_demux = (demux_t *)p_this;
- demux_sys_t *p_sys = p_demux->p_sys;
-
- if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
- if( p_sys->p_xml ) xml_Delete( p_sys->p_xml );
- free( p_sys );
+ (void)p_this;
}
/* "specs" : http://phobos.apple.com/static/iTunesRSS.html */
static int Demux( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_demux->p_sys;
-
bool b_item = false;
bool b_image = false;
int i_ret;
xml_t *p_xml;
- xml_reader_t *p_xml_reader;
+ xml_reader_t *p_xml_reader = NULL;
char *psz_elname = NULL;
char *psz_item_mrl = NULL;
char *psz_item_size = NULL;
char *psz_item_keywords = NULL;
char *psz_item_subtitle = NULL;
char *psz_item_summary = NULL;
+ char *psz_art_url = NULL;
int i_type;
input_item_t *p_input;
+ input_item_node_t *p_subitems = NULL;
- INIT_PLAYLIST_STUFF;
+ input_item_t *p_current_input = GetCurrentItem(p_demux);
- p_xml = p_sys->p_xml = xml_Create( p_demux );
- if( !p_xml ) return -1;
-
-/* psz_elname = stream_ReadLine( p_demux->s );
- if( psz_elname ) free( psz_elname );
- psz_elname = 0;*/
+ p_xml = xml_Create( p_demux );
+ if( !p_xml )
+ goto error;
p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
- if( !p_xml_reader ) return -1;
- p_sys->p_xml_reader = p_xml_reader;
+ if( !p_xml_reader )
+ goto error;
/* xml */
/* check root node */
if( xml_ReaderRead( p_xml_reader ) != 1 )
{
msg_Err( p_demux, "invalid file (no root node)" );
- return -1;
+ goto error;
}
while( xml_ReaderNodeType( p_xml_reader ) == XML_READER_NONE )
if( xml_ReaderRead( p_xml_reader ) != 1 )
{
msg_Err( p_demux, "invalid file (no root node)" );
- return -1;
+ goto error;
}
}
{
msg_Err( p_demux, "invalid root node %i, %s",
xml_ReaderNodeType( p_xml_reader ), psz_elname );
- free( psz_elname );
- return -1;
+ goto error;
}
FREENULL( psz_elname );
+ p_subitems = input_item_node_Create( p_current_input );
+
while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 )
{
// Get the node type
{
// Error
case -1:
- return -1;
- break;
+ goto error;
case XML_READER_STARTELEM:
{
// Read the element name
free( psz_elname );
psz_elname = xml_ReaderName( p_xml_reader );
- if( !psz_elname ) return -1;
+ if( !psz_elname )
+ goto error;
if( !strcmp( psz_elname, "item" ) )
{
{
free( psz_name );
free( psz_value );
- free( psz_elname );
- return -1;
+ goto error;
}
if( !strcmp( psz_elname, "enclosure" ) )
}
else
{
- msg_Dbg( p_demux,"unhandled attribure %s in element %s",
+ msg_Dbg( p_demux,"unhandled attribute %s in element %s",
psz_name, psz_elname );
free( psz_value );
}
}
else
{
- msg_Dbg( p_demux,"unhandled attribure %s in element %s",
+ msg_Dbg( p_demux,"unhandled attribute %s in element %s",
psz_name, psz_elname );
free( psz_value );
}
}
case XML_READER_TEXT:
{
+ if(!psz_elname) break;
+
char *psz_text = xml_ReaderValue( p_xml_reader );
#define SET_DATA( field, name ) \
}
else
{
- msg_Dbg( p_demux, "unhandled text in element '%s'",
- psz_elname );
- free( psz_text );
+ if( !strcmp( psz_elname, "url" ) )
+ {
+ free( psz_art_url );
+ psz_art_url = psz_text;
+ }
+ else
+ {
+ msg_Dbg( p_demux, "unhandled text in element '%s'",
+ psz_elname );
+ free( psz_text );
+ }
}
break;
}
// Read the element name
free( psz_elname );
psz_elname = xml_ReaderName( p_xml_reader );
- if( !psz_elname ) return -1;
+ if( !psz_elname )
+ goto error;
if( !strcmp( psz_elname, "item" ) )
{
if( psz_item_mrl == NULL )
{
msg_Err( p_demux, "invalid XML (no enclosure markup)" );
- free( psz_elname );
- return -1;
+ goto error;
}
p_input = input_item_New( p_demux, psz_item_mrl, psz_item_name );
if( p_input == NULL ) break;
/* Set the duration if available */
if( psz_item_duration )
input_item_SetDuration( p_input, strTimeToMTime( psz_item_duration ) );
+ /* Add the global art url to this item, if any */
+ if( psz_art_url )
+ input_item_SetArtURL( p_input, psz_art_url );
if( psz_item_size )
{
"%s bytes",
psz_item_size );
}
- input_item_AddSubItem( p_current_input, p_input );
+ input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
FREENULL( psz_item_name );
FREENULL( psz_item_mrl );
msg_Warn( p_demux, "error while parsing data" );
}
+ free( psz_art_url );
free( psz_elname );
+ xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_Delete( p_xml );
- HANDLE_PLAY_AND_RELEASE;
+ input_item_node_PostAndDelete( p_subitems );
+ vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */
+
+error:
+ free( psz_item_name );
+ free( psz_item_mrl );
+ free( psz_item_size );
+ free( psz_item_type );
+ free( psz_item_date );
+ free( psz_item_author );
+ free( psz_item_category );
+ free( psz_item_duration );
+ free( psz_item_keywords );
+ free( psz_item_subtitle );
+ free( psz_item_summary );
+ free( psz_art_url );
+ free( psz_elname );
+
+ if( p_xml_reader )
+ xml_ReaderDelete( p_xml, p_xml_reader );
+ if( p_xml )
+ xml_Delete( p_xml );
+ if( p_subitems )
+ input_item_node_Delete( p_subitems );
+
+ vlc_gc_decref(p_current_input);
+ return -1;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
projects / vlc / blobdiff