/*****************************************************************************
* b4s.c : B4S playlist format import
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: m3u.c 10101 2005-03-02 16:47:31Z robux4 $
+ * Copyright (C) 2005 the VideoLAN team
+ * $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
+#include <vlc_xml.h>
-#include <errno.h> /* ENOMEM */
#include "playlist.h"
-#include "vlc_xml.h"
struct demux_sys_t
{
char *psz_prefix;
- playlist_t *p_playlist;
xml_t *p_xml;
xml_reader_t *p_xml_reader;
};
*****************************************************************************/
static int Demux( demux_t *p_demux);
static int Control( demux_t *p_demux, int i_query, va_list args );
+//static char *GetNextToken(char *psz_cur_string);
static int IsWhitespace( char *psz_string );
/*****************************************************************************
*****************************************************************************/
int Import_B4S( vlc_object_t *p_this )
{
- demux_t *p_demux = (demux_t *)p_this;
-
- char *psz_ext;
-
- psz_ext = strrchr ( p_demux->psz_path, '.' );
-
- if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
- ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s") ) )
- {
- ;
- }
- else
- {
- return VLC_EGENERIC;
- }
- msg_Dbg( p_demux, "using b4s playlist import");
-
- p_demux->pf_control = Control;
- p_demux->pf_demux = Demux;
- p_demux->p_sys = malloc( sizeof(demux_sys_t) );
- if( p_demux->p_sys == NULL )
- {
- msg_Err( p_demux, "Out of memory" );
- return VLC_ENOMEM;
- }
+ DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
+ "using B4S playlist reader" );
p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
-
+ p_demux->p_sys->p_xml = NULL;
+ p_demux->p_sys->p_xml_reader = NULL;
return VLC_SUCCESS;
}
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->psz_prefix ) free( p_sys->psz_prefix );
- if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist );
+ free( p_sys->psz_prefix );
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 );
static int Demux( demux_t *p_demux )
{
- playlist_t *p_playlist;
-
+ demux_sys_t *p_sys = p_demux->p_sys;
int i_ret;
- playlist_item_t *p_item, *p_current;
-
- vlc_bool_t b_play;
-
xml_t *p_xml;
xml_reader_t *p_xml_reader;
char *psz_elname = NULL;
int i_type;
+ input_item_t *p_input;
char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
- demux_sys_t *p_sys = p_demux->p_sys;
-
-
- p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
- if( !p_playlist )
- {
- msg_Err( p_demux, "can't find playlist" );
- return -1;
- }
- p_sys->p_playlist = p_playlist;
-
- b_play = FindItem( p_demux, p_playlist, &p_current );
- playlist_ItemToNode( p_playlist, p_current );
- p_current->input.i_type = ITEM_TYPE_PLAYLIST;
+ input_item_t *p_current_input = GetCurrentItem(p_demux);
- p_xml = xml_Create( p_demux );
+ p_xml = p_sys->p_xml = xml_Create( p_demux );
if( !p_xml ) return -1;
- p_sys->p_xml = p_xml;
- stream_ReadLine( p_demux->s );
+ psz_elname = stream_ReadLine( p_demux->s );
+ free( psz_elname );
+ psz_elname = NULL;
+
p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
if( !p_xml_reader ) return -1;
p_sys->p_xml_reader = p_xml_reader;
/* xml */
/* check root node */
- i_ret = xml_ReaderRead( p_xml_reader );
- if( i_ret != 1 ||
- xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
+ if( xml_ReaderRead( p_xml_reader ) != 1 )
+ {
+ msg_Err( p_demux, "invalid file (no root node)" );
+ return -1;
+ }
+
+ if( xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL ||
strcmp( psz_elname, "WinampXML" ) )
{
- msg_Err( p_demux, "invalid file %i,%s", xml_ReaderNodeType( p_xml_reader ), psz_elname );
- if( psz_elname ) free( psz_elname );
+ msg_Err( p_demux, "invalid root node %i, %s",
+ xml_ReaderNodeType( p_xml_reader ), psz_elname );
+ free( psz_elname );
return -1;
}
free( psz_elname );
/* root node should not have any attributes, and should only
* contain the "playlist node */
- i_ret = xml_ReaderRead( p_xml_reader );
- if( i_ret == 1 && xml_ReaderNodeType( p_xml_reader ) == XML_READER_TEXT )
+
+ /* Skip until 1st child node */
+ while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 &&
+ xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM );
+ if( i_ret != 1 )
{
- i_ret = xml_ReaderRead( p_xml_reader );
+ msg_Err( p_demux, "invalid file (no child node)" );
+ return -1;
}
- if( i_ret != 1 ||
- xml_ReaderNodeType( p_xml_reader ) != XML_READER_STARTELEM ||
- ( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL ||
+
+ if( ( psz_elname = xml_ReaderName( p_xml_reader ) ) == NULL ||
strcmp( psz_elname, "playlist" ) )
{
- msg_Err( p_demux, "invalid file %i,%s", xml_ReaderNodeType( p_xml_reader ), psz_elname );
- msg_Err( p_demux, "invalid file" );
- if( psz_elname ) free( psz_elname );
+ msg_Err( p_demux, "invalid child node %s", psz_elname );
+ free( psz_elname );
return -1;
}
+ free( psz_elname ); psz_elname = NULL;
+
// Read the attributes
while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
{
char *psz_name = xml_ReaderName( p_xml_reader );
char *psz_value = xml_ReaderValue( p_xml_reader );
- if( !psz_name || !psz_value ) return -1;
+ if( !psz_name || !psz_value )
+ {
+ free( psz_name );
+ free( psz_value );
+ return -1;
+ }
if( !strcmp( psz_name, "num_entries" ) )
{
msg_Dbg( p_demux, "playlist has %d entries", atoi(psz_value) );
}
else if( !strcmp( psz_name, "label" ) )
{
- playlist_ItemSetName( p_current, psz_value );
+ input_item_SetName( p_current_input, psz_value );
}
else
{
free( psz_name );
free( psz_value );
}
-
- i_ret = xml_ReaderRead( p_xml_reader );
- while( i_ret == 1 )
+
+ while( (i_ret = xml_ReaderRead( p_xml_reader )) == 1 )
{
// Get the node type
i_type = xml_ReaderNodeType( p_xml_reader );
free( psz_elname );
psz_elname = xml_ReaderName( p_xml_reader );
if( !psz_elname ) return -1;
-
+
// Read the attributes
while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
{
char *psz_name = xml_ReaderName( p_xml_reader );
char *psz_value = xml_ReaderValue( p_xml_reader );
- if( !psz_name || !psz_value ) return -1;
+ if( !psz_name || !psz_value )
+ {
+ free( psz_name );
+ free( psz_value );
+ return -1;
+ }
if( !strcmp( psz_elname, "entry" ) &&
!strcmp( psz_name, "Playstring" ) )
{
- psz_mrl = strdup( psz_value );
+ psz_mrl = psz_value;
}
else
{
msg_Warn( p_demux, "unexpected attribure %s in element %s",
psz_name, psz_elname );
+ free( psz_value );
}
free( psz_name );
- free( psz_value );
}
break;
}
}
if( !strcmp( psz_elname, "Name" ) )
{
- psz_name = strdup( psz_text );
+ psz_name = psz_text;
}
else if( !strcmp( psz_elname, "Genre" ) )
{
- psz_genre = strdup( psz_text );
+ psz_genre = psz_text;
}
else if( !strcmp( psz_elname, "Nowplaying" ) )
{
- psz_now = strdup( psz_text );
+ psz_now = psz_text;
}
else if( !strcmp( psz_elname, "Listeners" ) )
{
- psz_listeners = strdup( psz_text );
+ psz_listeners = psz_text;
}
else if( !strcmp( psz_elname, "Bitrate" ) )
{
- psz_bitrate = strdup( psz_text );
+ psz_bitrate = psz_text;
}
else if( !strcmp( psz_elname, "" ) )
{
- ;
+ free( psz_text );
}
else
{
msg_Warn( p_demux, "unexpected text in element '%s'",
psz_elname );
+ free( psz_text );
}
- free( psz_text );
break;
}
// End element
if( !psz_elname ) return -1;
if( !strcmp( psz_elname, "entry" ) )
{
- p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name );
+ p_input = input_item_New( p_demux, psz_mrl, psz_name );
if( psz_now )
- {
- vlc_input_item_AddInfo( &(p_item->input),
- _("Meta-information"),
- _( VLC_META_NOW_PLAYING ),
- "%s",
- psz_now );
- }
+ input_item_SetNowPlaying( p_input, psz_now );
if( psz_genre )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( VLC_META_GENRE ),
- "%s",
- psz_genre );
- }
+ input_item_SetGenre( p_input, psz_genre );
if( psz_listeners )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Listeners" ),
- "%s",
- psz_listeners );
- }
+ msg_Err( p_demux, "Unsupported meta listeners" );
if( psz_bitrate )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Bitrate" ),
- "%s",
- psz_bitrate );
- }
- playlist_NodeAddItem( p_playlist, p_item,
- p_current->pp_parents[0]->i_view,
- p_current, PLAYLIST_APPEND,
- PLAYLIST_END );
-
- /* We need to declare the parents of the node as the
- * * same of the parent's ones */
- playlist_CopyParents( p_current, p_item );
-
- vlc_input_item_CopyOptions( &p_current->input,
- &p_item->input );
-#define FREE(a) if( a ) free( a ); a = NULL;
- FREE( psz_name );
- FREE( psz_mrl );
- FREE( psz_genre );
- FREE( psz_bitrate );
- FREE( psz_listeners );
- FREE( psz_now );
-#undef FREE
+ msg_Err( p_demux, "Unsupported meta bitrate" );
+
+ input_item_AddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
+ FREENULL( psz_name );
+ FREENULL( psz_mrl );
+ FREENULL( psz_genre );
+ FREENULL( psz_bitrate );
+ FREENULL( psz_listeners );
+ FREENULL( psz_now );
}
free( psz_elname );
- psz_elname = strdup("");
+ psz_elname = strdup( "" );
break;
}
}
- i_ret = xml_ReaderRead( p_xml_reader );
}
- if( i_ret != 0 ) return -1;
- /* end */
- /* Go back and play the playlist */
- if( b_play )
+ if( i_ret != 0 )
{
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.i_view,
- p_playlist->status.p_item, NULL );
+ msg_Warn( p_demux, "error while parsing data" );
}
-
- vlc_object_release( p_playlist );
- p_sys->p_playlist = NULL;
- return VLC_SUCCESS;
+
+ free( psz_elname );
+
+ vlc_gc_decref(p_current_input);
+ return 0; /* Needed for correct operation of go back */
}
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;
}
+#if 0
+/**
+ * Get a in-string pointer to the start of the next token from a
+ * string terminating the pointer returned by a previous call.
+ *
+ * \param psz_cur_string The string to search for the token from
+ * \return a pointer to withing psz_cur_string, or NULL if no token
+ * was found
+ * \note The returned pointer may contain more than one
+ * token, Run GetNextToken once more to terminate the token properly
+ */
+static char *GetNextToken(char *psz_cur_string) {
+ while (*psz_cur_string && !isspace(*psz_cur_string))
+ psz_cur_string++;
+ if (!*psz_cur_string)
+ return NULL;
+ *psz_cur_string++ = '\0';
+ while (*psz_cur_string && isspace(*psz_cur_string))
+ psz_cur_string++;
+ return psz_cur_string;
+}
+#endif
+
static int IsWhitespace( char *psz_string )
{
while( *psz_string )
if( *psz_string != ' ' && *psz_string != '\t' && *psz_string != '\r' &&
*psz_string != '\n' )
{
- return VLC_FALSE;
+ return false;
}
psz_string++;
}
- return VLC_TRUE;
+ return true;
}
projects / vlc / blobdiff