/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <ctype.h> /* isspace() */
-#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 <errno.h> /* ENOMEM */
#include "playlist.h"
#include "vlc_xml.h"
struct demux_sys_t
{
- playlist_t *p_playlist;
- playlist_item_t *p_current;
- playlist_item_t *p_item_in_category;
- int i_parent_id;
+ input_item_t *p_current_input;
xml_t *p_xml;
xml_reader_t *p_xml_reader;
- vlc_bool_t b_adult;
+ bool b_adult;
};
/* duplicate from modules/services_discovery/shout.c */
/*****************************************************************************
* Import_Shoutcast: main import function
*****************************************************************************/
-int E_(Import_Shoutcast)( vlc_object_t *p_this )
+int Import_Shoutcast( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- if( !isDemux( p_demux, "shout-winamp" ) )
+ if( !demux_IsForced( p_demux, "shout-winamp" ) )
return VLC_EGENERIC;
STANDARD_DEMUX_INIT_MSG( "using shoutcast playlist reader" );
- p_demux->p_sys->p_playlist = NULL;
p_demux->p_sys->p_xml = NULL;
p_demux->p_sys->p_xml_reader = NULL;
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void E_(Close_Shoutcast)( vlc_object_t *p_this )
+void Close_Shoutcast( 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_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_reader_t *p_xml_reader;
char *psz_eltname = NULL;
INIT_PLAYLIST_STUFF;
- p_sys->p_playlist = p_playlist;
- p_sys->p_current = p_current;
- p_sys->i_parent_id = i_parent_id;
- p_sys->p_item_in_category = p_item_in_category;
+ p_sys->p_current_input = p_current_input;
p_xml = p_sys->p_xml = xml_Create( p_demux );
if( !p_xml ) return -1;
{
msg_Err( p_demux, "invalid root node %i, %s",
xml_ReaderNodeType( p_xml_reader ), psz_eltname );
- if( psz_eltname ) free( psz_eltname );
+ free( psz_eltname );
return -1;
}
}
HANDLE_PLAY_AND_RELEASE;
- p_sys->p_playlist = NULL;
- return VLC_SUCCESS;
+ return 0; /* Needed for correct operation of go back */
}
#define GET_VALUE( a ) \
if( !psz_eltname ) return -1;
if( !strcmp( psz_eltname, "genre" ) )
{
- char *psz_mrl = malloc( strlen( SHOUTCAST_BASE_URL )
- + strlen( "?genre=" ) + strlen( psz_name ) + 1 );
- sprintf( psz_mrl, SHOUTCAST_BASE_URL "?genre=%s",
- psz_name );
- p_input = input_ItemNewExt( p_sys->p_playlist, psz_mrl,
- psz_name, 0, NULL, -1 );
- vlc_input_item_CopyOptions( p_sys->p_current->p_input,
- p_input );
- free( psz_mrl );
- playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
- p_sys->p_current, p_sys->p_item_in_category,
- (p_sys->i_parent_id > 0 ) ? VLC_TRUE: VLC_FALSE,
- PLAYLIST_APPEND );
+ char* psz_mrl;
+ if( asprintf( &psz_mrl, SHOUTCAST_BASE_URL "?genre=%s",
+ psz_name ) != -1 )
+ {
+ p_input = input_item_New( p_demux, psz_mrl, psz_name );
+ input_item_CopyOptions( p_sys->p_current_input, p_input );
+ free( psz_mrl );
+ input_item_AddSubItem( p_sys->p_current_input, p_input );
+ vlc_gc_decref( p_input );
+ }
FREENULL( psz_name );
}
FREENULL( psz_eltname );
xml_ReaderValue( p_sys->p_xml_reader );
if( !psz_attrname || !psz_attrvalue )
{
- free(psz_eltname);
- FREENULL(psz_attrname);
- FREENULL(psz_attrvalue);
+ free( psz_eltname );
+ free( psz_attrname );
+ free( psz_attrvalue );
return -1;
}
xml_ReaderValue( p_sys->p_xml_reader );
if( !psz_attrname || !psz_attrvalue )
{
- free(psz_eltname);
- FREENULL(psz_attrname);
- FREENULL(psz_attrvalue);
+ free( psz_eltname );
+ free( psz_attrname );
+ free( psz_attrvalue );
return -1;
}
free( psz_attrvalue );
}
}
- free(psz_eltname);
+ free( psz_eltname );
break;
case XML_READER_TEXT:
if( psz_rt || psz_load )
{
/* tv */
- psz_mrl = malloc( strlen( SHOUTCAST_TV_TUNEIN_URL )
- + strlen( psz_id ) + 1 );
- sprintf( psz_mrl, SHOUTCAST_TV_TUNEIN_URL "%s",
- psz_id );
+ if( asprintf( &psz_mrl, SHOUTCAST_TV_TUNEIN_URL "%s",
+ psz_id ) == -1)
+ psz_mrl = NULL;
}
else
{
/* radio */
- psz_mrl = malloc( strlen( SHOUTCAST_TUNEIN_BASE_URL )
- + strlen( psz_base ) + strlen( "?id=" )
- + strlen( psz_id ) + 1 );
- sprintf( psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s",
- psz_base, psz_id );
+ if( asprintf( &psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s",
+ psz_base, psz_id ) == -1 )
+ psz_mrl = NULL;
}
- p_input = input_ItemNewExt( p_sys->p_playlist, psz_mrl,
- psz_name , 0, NULL, -1 );
+ p_input = input_item_New( p_demux, psz_mrl, psz_name );
+ input_item_CopyOptions( p_sys->p_current_input, p_input );
free( psz_mrl );
- vlc_input_item_CopyOptions( p_sys->p_current->p_input,
- p_input );
-
-#define SADD_INFO( type, field ) if( field ) { vlc_input_item_AddInfo( \
- p_input, _("Shoutcast"), _(type), "%s", field ) ; }
- SADD_INFO( "Mime type", psz_mt );
- SADD_INFO( "Bitrate", psz_br );
- SADD_INFO( "Listeners", psz_lc );
- SADD_INFO( "Load", psz_load );
- p_input->p_meta = vlc_meta_New();
+#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \
+ p_input, _("Shoutcast"), gettext(type), "%s", field ) ; }
+ SADD_INFO( N_("Mime"), psz_mt );
+ SADD_INFO( N_("Bitrate"), psz_br );
+ SADD_INFO( N_("Listeners"), psz_lc );
+ SADD_INFO( N_("Load"), psz_load );
if( psz_genre )
- vlc_meta_SetGenre( p_input->p_meta, psz_genre );
+ input_item_SetGenre( p_input, psz_genre );
if( psz_ct )
- vlc_meta_SetNowPlaying( p_input->p_meta, psz_ct );
+ input_item_SetNowPlaying( p_input, psz_ct );
if( psz_rt )
- vlc_meta_SetRating( p_input->p_meta, psz_rt );
-
- playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
- p_sys->p_current, p_sys->p_item_in_category,
- (p_sys->i_parent_id > 0 ) ? VLC_TRUE: VLC_FALSE,
- PLAYLIST_APPEND );
-
+ input_item_SetRating( p_input, psz_rt );
+ input_item_AddSubItem( p_sys->p_current_input, p_input );
+ vlc_gc_decref( p_input );
FREENULL( psz_name );
- FREENULL( psz_mt )
- FREENULL( psz_id )
- FREENULL( psz_br )
- FREENULL( psz_genre )
- FREENULL( psz_ct )
- FREENULL( psz_lc )
- FREENULL( psz_rt )
+ FREENULL( psz_mt );
+ FREENULL( psz_id );
+ FREENULL( psz_br );
+ FREENULL( psz_genre );
+ FREENULL( psz_ct );
+ FREENULL( psz_lc );
+ FREENULL( psz_rt );
}
free( psz_eltname );
break;
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;
}
projects / vlc / blobdiff