*/
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
#include "playlist.h"
#include "vlc_xml.h"
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 );
*/
int E_(Import_xspf)( vlc_object_t *p_this )
{
- DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".xspf", "xspf-open",
+ 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 )
{
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 );
}
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 = -1;
+ 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 );
FREE_NAME();
}
- i_ret = parse_playlist_node( p_demux, p_playlist, p_current, NULL,
+ i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input,
p_xml_reader, "playlist" );
HANDLE_PLAY_AND_RELEASE;
if( p_xml_reader )
xml_ReaderDelete( p_xml, p_xml_reader );
if( p_xml )
xml_Delete( p_xml );
- return VLC_SUCCESS;
+ return -1; /* Needed for correct operation of go back */
}
/** \brief dummy function for demux callback interface */
* \brief parse the root node of a XSPF playlist
* \param p_demux demuxer instance
* \param p_playlist playlist instance
- * \param p_item current playlist item
- * \param p_input current input item
+ * \param p_input_item current input item
* \param p_xml_reader xml reader instance
* \param psz_element name of element to parse
*/
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} },
/* attribute: 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 <playlist> attribute:\"%s\"", psz_name);
{
if( p_handler->pf_handler.cmplx( p_demux,
p_playlist,
- p_item,NULL,
+ p_input_item,
p_xml_reader,
p_handler->name ) )
{
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();
FREE_NAME();
/* parse the track data in a separate function */
- if( parse_track_node( p_demux, p_playlist, p_item, NULL,
+ if( parse_track_node( p_demux, p_playlist, p_input_item,
p_xml_reader,"track" ) == VLC_TRUE )
i_ntracks++;
}
{"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} },
{"album", SIMPLE_CONTENT, {.smpl = set_item_info} },
}
if( p_handler->pf_handler.cmplx( p_demux,
p_playlist,
- NULL, p_new_input,
+ p_new_input,
p_xml_reader,
p_handler->name ) )
{
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 );
+ input_ItemAddSubItem( p_input_item, p_new_input );
if( p_demux->p_sys->i_identifier <
p_demux->p_sys->i_tracklist_entries )
{
if( 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 )
+ {
+ 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;
+ }
p_new_input = input_ItemNewExt( p_playlist, psz_uri,
NULL, 0, NULL, -1 );
- p_new_input->p_meta = vlc_meta_New();
free( psz_uri );
- input_ItemCopyOptions( p_item->p_input, p_new_input );
+ input_ItemCopyOptions( p_input_item, p_new_input );
psz_uri = NULL;
FREE_ATT();
p_handler = NULL;
}
if( p_handler->pf_handler.smpl )
{
- p_handler->pf_handler.smpl( NULL, p_new_input,
+ p_handler->pf_handler.smpl( p_new_input,
p_handler->name,
psz_value );
FREE_ATT();
}
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" ) )
{
- vlc_meta_SetAlbum( p_input->p_meta, psz_value );
+ input_item_SetAlbum( p_input, psz_value );
}
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" ) )
{
long i_num = atol( psz_value );
p_input->i_duration = i_num*1000;
}
+ else if( !strcmp( psz_name, "annotation" ) )
+ {
+ input_item_SetDescription( p_input, psz_value );
+ }
return VLC_TRUE;
}
{
if( p_handler->pf_handler.cmplx( p_demux,
p_playlist,
- p_item, NULL,
+ p_input_item,
p_xml_reader,
p_handler->name ) )
{
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();