* 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
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
#include "playlist.h"
#include "vlc_xml.h"
void E_(Close_xspf)( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- FREENULL( p_demux->p_sys->psz_base);
+ FREENULL( p_demux->p_sys->pp_tracklist );
+ FREENULL( p_demux->p_sys->psz_base );
free( p_demux->p_sys );
}
*/
int Demux( demux_t *p_demux )
{
- int i_ret = VLC_SUCCESS;
+ int i_ret = 1;
xml_t *p_xml = NULL;
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->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 );
if( !p_xml )
- i_ret = VLC_ENOMOD;
+ i_ret = -1;
else
{
p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
if( !p_xml_reader )
- i_ret = VLC_EGENERIC;
+ i_ret = -1;
}
/* locating the root node */
- if( i_ret == VLC_SUCCESS )
+ if( i_ret == 1 )
{
do
{
if( xml_ReaderRead( p_xml_reader ) != 1 )
{
msg_Err( p_demux, "can't read xml stream" );
- i_ret = VLC_EGENERIC;
+ i_ret = -1;
}
} while( i_ret == VLC_SUCCESS &&
xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM );
}
/* checking root node name */
- if( i_ret == VLC_SUCCESS )
+ if( i_ret == 1 )
{
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 );
- i_ret = VLC_EGENERIC;
+ i_ret = -1;
}
FREE_NAME();
}
- i_ret = parse_playlist_node( p_demux, p_playlist, p_current, NULL,
- p_xml_reader, "playlist" );
+ if( i_ret == 1 )
+ 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 )
xml_ReaderDelete( p_xml, p_xml_reader );
if( p_xml )
xml_Delete( p_xml );
- return -1; /* Needed for correct operation of go back */
+ 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_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} },
- {"image", SIMPLE_CONTENT, {NULL} },
+ {"image", SIMPLE_CONTENT, {.smpl = set_item_info} },
{"date", SIMPLE_CONTENT, {NULL} },
{"license", SIMPLE_CONTENT, {NULL} },
{"attribution", COMPLEX_CONTENT, {.cmplx = skip_element} },
{
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();
*/
static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE
{
+ VLC_UNUSED(psz_element);
char *psz_name=NULL;
int i_node;
int i_ntracks = 0;
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} },
+ {"image", SIMPLE_CONTENT, {.smpl = set_item_info} },
{"album", SIMPLE_CONTENT, {.smpl = set_item_info} },
{"trackNum", SIMPLE_CONTENT, {.smpl = set_item_info} },
{"duration", 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();
- playlist_BothAddInput( p_playlist, p_new_input,
- p_demux->p_sys->p_item_in_category,
- PLAYLIST_APPEND, PLAYLIST_END );
if( p_demux->p_sys->i_identifier <
p_demux->p_sys->i_tracklist_entries )
{
if( psz_uri )
{
- if( p_demux->p_sys->psz_base &&
+ if( p_demux->p_sys->psz_base &&
!strstr( psz_uri, "://" ) )
{
- char* psz_tmp = malloc(
- strlen(p_demux->p_sys->psz_base) +
+ 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",
+ sprintf( psz_tmp, "%s%s",
p_demux->p_sys->psz_base, psz_uri );
free( psz_uri );
psz_uri = psz_tmp;
}
+ /* FIXME: We are leaking that one */
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();
/* handle each info element in a separate "if" clause */
if( !strcmp( psz_name, "title" ) )
{
- p_input->psz_name = strdup( (char*)psz_value );
+ input_item_SetTitle( p_input, psz_value );
}
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;
+ input_item_SetDuration( p_input, (mtime_t) i_num*1000 );
+ }
+ else if( !strcmp( psz_name, "annotation" ) )
+ {
+ input_item_SetDescription( p_input, psz_value );
+ }
+ else if( !strcmp( psz_name, "image" ) )
+ {
+ char *psz_uri = decode_URI_duplicate( psz_value );
+ input_item_SetArtURL( p_input, psz_uri );
+ free( psz_uri );
}
return VLC_TRUE;
}
char *psz_name = NULL;
char *psz_value = NULL;
char *psz_title = NULL;
+ char *psz_application = NULL;
int i_node;
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} },
/* attribute: title */
if( !strcmp( psz_name, "title" ) )
{
- psz_title = unescape_URI_duplicate( psz_value );
+ resolve_xml_special_chars( psz_value );
+ psz_title = strdup( psz_value );
+ }
+ /* extension attribute: application */
+ else if( !strcmp( psz_name, "application" ) )
+ {
+ psz_application = strdup( psz_value );
}
/* unknown attribute */
else
- msg_Warn( p_demux, "invalid <node> attribute:\"%s\"", psz_name);
+ msg_Warn( p_demux, "invalid <%s> attribute:\"%s\"", psz_element, psz_name );
FREE_ATT();
}
/* attribute title is mandatory except for <extension> */
- if( !strcmp( psz_element, "node" ) && !psz_title )
+ if( !strcmp( psz_element, "node" ) )
{
- msg_Warn( p_demux, "<node> requires \"title\" attribute" );
- return VLC_FALSE;
+ if( !psz_title )
+ {
+ msg_Warn( p_demux, "<node> requires \"title\" attribute" );
+ return VLC_FALSE;
+ }
+ p_new_input = input_ItemNewWithType( VLC_OBJECT( p_playlist ), "vlc:nop",
+ psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY );
+ if( p_new_input )
+ {
+ input_ItemAddSubItem( p_input_item, p_new_input );
+ p_input_item = p_new_input;
+ }
+ free( psz_title );
}
- if( psz_title ) free( psz_title );
+ else if( !strcmp( psz_element, "extension" ) )
+ {
+ if( !psz_application )
+ {
+ msg_Warn( p_demux, "<extension> requires \"application\" attribute" );
+ return VLC_FALSE;
+ }
+ 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;
+ }
+ }
+ free( psz_application );
/* parse the child elements */
while( xml_ReaderRead( p_xml_reader ) == 1 )
{
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();
*/
static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
{
+ VLC_UNUSED(p_playlist); VLC_UNUSED(psz_element);
+ input_item_t *p_new_input = NULL;
char *psz_name = NULL;
char *psz_value = NULL;
int i_href = -1;
return VLC_FALSE;
}
- if( i_href > p_demux->p_sys->i_tracklist_entries )
+ if( i_href >= p_demux->p_sys->i_tracklist_entries )
{
msg_Warn( p_demux, "invalid \"href\" attribute" );
return VLC_FALSE;
}
+
+ p_new_input = p_demux->p_sys->pp_tracklist[ i_href ];
+ if( p_new_input )
+ {
+ input_ItemAddSubItem( p_input_item, p_new_input );
+ p_demux->p_sys->pp_tracklist[i_href] = NULL;
+ }
+
+ /* kludge for #1293 - XTAG sends ENDELEM for self closing tag */
+ /* (libxml sends NONE) */
+ xml_ReaderRead( p_xml_reader );
+
return VLC_TRUE;
}
*/
static vlc_bool_t skip_element COMPLEX_INTERFACE
{
+ VLC_UNUSED(p_demux); VLC_UNUSED(p_playlist); VLC_UNUSED(p_input_item);
char *psz_endname;
while( xml_ReaderRead( p_xml_reader ) == 1 )
projects / vlc / blobdiff