* 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.
*****************************************************************************/
/*****************************************************************************
struct demux_sys_t
{
char *psz_prefix;
- playlist_t *p_playlist;
xml_t *p_xml;
xml_reader_t *p_xml_reader;
- int b_shout;
};
/*****************************************************************************
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 );
-static void ShoutcastAdd( playlist_t *p_playlist, playlist_item_t* p_genre,
- playlist_item_t *p_bitrate, playlist_item_t *p_item,
- char *psz_genre, char *psz_bitrate );
/*****************************************************************************
* Import_B4S: main import function
psz_ext = strrchr ( p_demux->psz_path, '.' );
if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
- ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s-open") ) ||
- ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "shout-b4s") ) )
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s-open") ) )
{
;
}
p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
if( p_sys == NULL )
{
- msg_Err( p_demux, "Out of memory" );
+ msg_Err( p_demux, "out of memory" );
return VLC_ENOMEM;
}
- p_sys->b_shout = p_demux->psz_demux &&
- !strcmp(p_demux->psz_demux, "shout-b4s");
p_sys->psz_prefix = E_(FindPrefix)( p_demux );
- p_sys->p_playlist = NULL;
p_sys->p_xml = NULL;
p_sys->p_xml_reader = NULL;
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 );
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 )
{
demux_sys_t *p_sys = p_demux->p_sys;
- playlist_t *p_playlist;
- playlist_item_t *p_item, *p_current;
+ playlist_item_t *p_item;
playlist_item_t *p_bitrate = NULL, *p_genre = NULL;
- vlc_bool_t b_play;
- int i_ret;
+ int i_ret, i_parent_id;
xml_t *p_xml;
xml_reader_t *p_xml_reader;
char *psz_elname = NULL;
- int i_type, b_shoutcast;
+ int i_type;
char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
-
- b_shoutcast = p_sys->b_shout;
-
- 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 = E_(FindItem)( p_demux, p_playlist, &p_current );
-
- playlist_ItemToNode( p_playlist, p_current );
- p_current->input.i_type = ITEM_TYPE_PLAYLIST;
- if( b_shoutcast )
- {
- p_genre = playlist_NodeCreate( p_playlist, p_current->pp_parents[0]->i_view, "Genre", p_current );
- playlist_CopyParents( p_current, p_genre );
-
- p_bitrate = playlist_NodeCreate( p_playlist, p_current->pp_parents[0]->i_view, "Bitrate", p_current );
- playlist_CopyParents( p_current, p_bitrate );
- }
+ INIT_PLAYLIST_STUFF;
p_xml = p_sys->p_xml = xml_Create( p_demux );
if( !p_xml ) return -1;
if( xml_ReaderRead( p_xml_reader ) != 1 )
{
msg_Err( p_demux, "invalid file (no root node)" );
+ vlc_object_release( p_playlist );
return -1;
}
msg_Err( p_demux, "invalid root node %i, %s",
xml_ReaderNodeType( p_xml_reader ), psz_elname );
if( psz_elname ) free( psz_elname );
+ vlc_object_release( p_playlist );
return -1;
}
free( psz_elname );
if( !psz_elname ) return -1;
if( !strcmp( psz_elname, "entry" ) )
{
- p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name );
+ p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
+ 0, NULL, -1 );
if( psz_now )
- {
- vlc_input_item_AddInfo( &(p_item->input),
- _("Meta-information"),
- _( VLC_META_NOW_PLAYING ),
- "%s",
- psz_now );
- }
+ vlc_meta_SetNowPlaying( p_input->p_meta, psz_now );
if( psz_genre )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( VLC_META_GENRE ),
- "%s",
- psz_genre );
- }
+ vlc_meta_SetGenre( p_input->p_meta, psz_genre );
if( psz_listeners )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Listeners" ),
- "%s",
- psz_listeners );
- }
+ msg_Err( p_playlist, "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 );
- if( b_shoutcast )
- {
- char *psz_genreToken;
- char *psz_otherToken;
- int i = 0;
-
- psz_genreToken = psz_genre;
-
- /* split up the combined genre string form
- shoutcast and add the individual genres */
- while ( psz_genreToken &&
- ( psz_otherToken = GetNextToken(psz_genreToken )))
- {
- if( strlen(psz_genreToken)>2 )
- /* We dont want genres below 2 letters,
- this gets rid of alot of junk*/
- {
- /* lowercase everything */
- for( i=0; psz_genreToken[i]!=0; i++ )
- psz_genreToken[i] =
- tolower(psz_genreToken[i]);
- /* Make first letter uppercase, purely cosmetical */
- psz_genreToken[0] =
- toupper( psz_genreToken[0] );
- ShoutcastAdd( p_playlist, p_genre,
- p_bitrate, p_item,
- psz_genreToken, psz_bitrate );
-
- psz_genreToken = psz_otherToken;
- }
- }
- }
+ msg_Err( p_playlist, "Unsupported meta bitrate" );
+
+ playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
+ p_item_in_category, (i_parent_id > 0 ) ? VLC_TRUE:
+ VLC_FALSE, PLAYLIST_APPEND );
#define FREE(a) if( a ) free( a ); a = NULL;
FREE( psz_name );
{
msg_Warn( p_demux, "error while parsing data" );
}
- if( b_shoutcast )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
- playlist_NodeSort( p_playlist, p_bitrate, SORT_TITLE_NUMERIC, ORDER_NORMAL );
- vlc_mutex_unlock( &p_playlist->object_lock );
- }
- /* Go back and play the playlist */
- if( b_play && p_playlist->status.p_item &&
- p_playlist->status.p_item->i_children > 0 )
- {
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.i_view,
- p_playlist->status.p_item,
- p_playlist->status.p_item->pp_children[0] );
- }
-
- vlc_object_release( p_playlist );
- p_sys->p_playlist = NULL;
+ HANDLE_PLAY_AND_RELEASE;
return VLC_SUCCESS;
}
}
return VLC_TRUE;
}
-
-static void ShoutcastAdd( playlist_t *p_playlist, playlist_item_t* p_genre,
- playlist_item_t *p_bitrate, playlist_item_t *p_item,
- char *psz_genre, char *psz_bitrate )
-{
- playlist_item_t *p_parent;
- if( psz_bitrate )
- {
- playlist_item_t *p_copy = playlist_ItemCopy(p_playlist,p_item);
- p_parent = playlist_ChildSearchName( p_bitrate, psz_bitrate );
- if( !p_parent )
- {
- p_parent = playlist_NodeCreate( p_playlist, p_genre->pp_parents[0]->i_view, psz_bitrate,
- p_bitrate );
- playlist_CopyParents( p_bitrate, p_parent );
- }
- playlist_NodeAddItem( p_playlist, p_copy, p_parent->pp_parents[0]->i_view, p_parent, PLAYLIST_APPEND, PLAYLIST_END );
- playlist_CopyParents( p_parent, p_copy );
-
- }
-
- if( psz_genre )
- {
- playlist_item_t *p_copy = playlist_ItemCopy(p_playlist,p_item);
- p_parent = playlist_ChildSearchName( p_genre, psz_genre );
- if( !p_parent )
- {
- p_parent = playlist_NodeCreate( p_playlist, p_genre->pp_parents[0]->i_view, psz_genre,
- p_genre );
- playlist_CopyParents( p_genre, p_parent );
- }
- playlist_NodeAddItem( p_playlist, p_copy, p_parent->pp_parents[0]->i_view, p_parent, PLAYLIST_APPEND, PLAYLIST_END );
- playlist_CopyParents( p_parent, p_copy );
- }
-}
projects / vlc / blobdiff