X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fshout.c;h=2103a4fda7bee4b6ba496a353b2eccb5b5ac04ef;hb=cafbe3a363e5e843fbacad5af0ebbb48254f5a3f;hp=ca61380332843bfa7d1434d37e0ccb1de99ec472;hpb=39c625244ad194802ca2eda1e53bb1884b9836d1;p=vlc diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c index ca61380332..2103a4fda7 100644 --- a/modules/services_discovery/shout.c +++ b/modules/services_discovery/shout.c @@ -1,11 +1,12 @@ /***************************************************************************** * shout.c: Shoutcast services discovery module ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2007 the VideoLAN team * $Id$ * * Authors: Sigmund Augdal Helberg * Antoine Cellerier + * Pierre d'Herbemont * * 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 @@ -25,136 +26,237 @@ /***************************************************************************** * Includes *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include - -#include - -#include /* ENOMEM */ - -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -/************************************************************************ - * Macros and definitions - ************************************************************************/ - -#define MAX_LINE_LENGTH 256 -#define SHOUTCAST_BASE_URL "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml" -#define SHOUTCAST_TV_BASE_URL "http/shout-winamp://www.shoutcast.com/sbin/newtvlister.phtml?alltv=1" +#include +#include +#include /***************************************************************************** * Module descriptor *****************************************************************************/ -/* Callbacks */ - static int Open ( vlc_object_t *, int ); - static int OpenRadio ( vlc_object_t * ); - static int OpenTV ( vlc_object_t * ); - static void Close( vlc_object_t * ); +enum type_e { ShoutRadio = 0, ShoutTV = 1, Freebox = 2, FrenchTV = 3 }; + +static int Open( vlc_object_t *, enum type_e ); +static void Close( vlc_object_t * ); + +struct shout_item_t +{ + const char *psz_url; + const char *psz_name; + const char *ppsz_options[2]; + const struct shout_item_t * p_children; +}; + +#define endItem( ) { NULL, NULL, { NULL }, NULL } +#define item( title, url ) { url, title, { NULL }, NULL } +#define itemWithOption( title, url, option ) { url, title, { option, NULL }, NULL } +#define itemWithChildren( title, children ) { "vlc://nop", title, { NULL }, children } + +/* WARN: We support only two levels */ + +static const struct shout_item_t p_frenchtv_canalplus[] = { + itemWithOption( N_("Les Guignols"), "http://www.canalplus.fr/index.php?pid=1784", "http-forward-cookies" ), + endItem() +}; + +static const struct shout_item_t p_frenchtv[] = { + itemWithChildren( N_("Canal +"), p_frenchtv_canalplus ), + endItem() +}; + +static const struct shout_item_t p_items[] = { + item( N_("Shoutcast Radio"), "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml" ), + item( N_("Shoutcast TV"), "http/shout-winamp://www.shoutcast.com/sbin/newtvlister.phtml?alltv=1" ), + item( N_("Freebox TV"), "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" ), + itemWithChildren(N_("French TV"), p_frenchtv ), + endItem() +}; + +#undef endItem +#undef item +#undef itemWithOptions +#undef itemWithChildren + +struct shout_category_t { + services_discovery_t * p_sd; + const char * psz_category; +}; + +/* Main functions */ +#define OPEN( type ) \ +static int Open ## type ( vlc_object_t *p_this ) \ +{ \ + msg_Dbg( p_this, "Starting " #type ); \ + return Open( p_this, type ); \ +} + +OPEN( ShoutRadio ) +OPEN( ShoutTV ) +OPEN( Freebox ) +OPEN( FrenchTV ) -vlc_module_begin(); - set_shortname( "Shoutcast"); - set_description( _("Shoutcast radio listings") ); - add_shortcut( "shoutcast" ); - set_category( CAT_PLAYLIST ); - set_subcategory( SUBCAT_PLAYLIST_SD ); +#undef OPEN - add_obsolete_integer( "shoutcast-limit" ); +vlc_module_begin () + set_category( CAT_PLAYLIST ) + set_subcategory( SUBCAT_PLAYLIST_SD ) - set_capability( "services_discovery", 0 ); - set_callbacks( OpenRadio, Close ); + add_obsolete_integer( "shoutcast-limit" ) - add_submodule(); - set_shortname( "ShoutcastTV" ); - set_description( _("Shoutcast TV listings") ); - set_capability( "services_discovery", 0 ); - set_callbacks( OpenTV, Close ); - add_shortcut( "shoutcasttv" ); + set_shortname( "Shoutcast") + set_description( N_("Shoutcast radio listings") ) + set_capability( "services_discovery", 0 ) + set_callbacks( OpenShoutRadio, Close ) + add_shortcut( "shoutcast" ) -vlc_module_end(); + add_submodule () + set_shortname( "ShoutcastTV" ) + set_description( N_("Shoutcast TV listings") ) + set_capability( "services_discovery", 0 ) + set_callbacks( OpenShoutTV, Close ) + add_shortcut( "shoutcasttv" ) + + add_submodule () + set_shortname( "frenchtv") + set_description( N_("French TV") ) + set_capability( "services_discovery", 0 ) + set_callbacks( OpenFrenchTV, Close ) + add_shortcut( "frenchtv" ) + + add_submodule () + set_shortname( "Freebox") + set_description( N_("Freebox TV listing (French ISP free.fr services)") ) + set_capability( "services_discovery", 0 ) + set_callbacks( OpenFreebox, Close ) + add_shortcut( "freebox" ) + +vlc_module_end () /***************************************************************************** - * Local structures + * Local prototypes *****************************************************************************/ +static void *Run( void * ); struct services_discovery_sys_t { - playlist_item_t *p_node_cat,*p_node_one; - input_item_t *p_input; - vlc_bool_t b_dialog; + vlc_thread_t thread; + enum type_e i_type; }; -#define RADIO 0 -#define TV 1 - /***************************************************************************** - * Local prototypes + * Open: initialize and create stuff *****************************************************************************/ +static int Open( vlc_object_t *p_this, enum type_e i_type ) +{ + services_discovery_t *p_sd = ( services_discovery_t* )p_this; -/* Main functions */ -static int OpenRadio( vlc_object_t *p_this ) + p_sd->p_sys = malloc (sizeof (*(p_sd->p_sys))); + if (p_sd->p_sys == NULL) + return VLC_ENOMEM; + + p_sd->p_sys->i_type = i_type; + if (vlc_clone (&p_sd->p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW)) + { + free (p_sd->p_sys); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +/***************************************************************************** + * ItemAdded: + *****************************************************************************/ +static void ItemAdded( const vlc_event_t * p_event, void * user_data ) { - return Open( p_this, RADIO ); + struct shout_category_t * params = user_data; + services_discovery_AddItem( params->p_sd, + p_event->u.input_item_subitem_added.p_new_child, + params->psz_category ); } -static int OpenTV( vlc_object_t *p_this ) +/***************************************************************************** + * CreateInputItemFromShoutItem: + *****************************************************************************/ +static input_item_t * CreateInputItemFromShoutItem( services_discovery_t *p_sd, + const struct shout_item_t * p_item ) { - return Open( p_this, TV ); + int i; + /* Create the item */ + input_item_t *p_input = input_item_New( p_sd, p_item->psz_url, + vlc_gettext(p_item->psz_name) ); + + /* Copy options */ + for( i = 0; p_item->ppsz_options[i] != NULL; i++ ) + input_item_AddOption( p_input, p_item->ppsz_options[i], VLC_INPUT_OPTION_TRUSTED ); + input_item_AddOption( p_input, "no-playlist-autostart", VLC_INPUT_OPTION_TRUSTED ); + + return p_input; } /***************************************************************************** - * Open: initialize and create stuff + * AddSubitemsOfShoutItemURL: *****************************************************************************/ -static int Open( vlc_object_t *p_this, int i_type ) +static void AddSubitemsOfShoutItemURL( services_discovery_t *p_sd, + const struct shout_item_t * p_item, + const char * psz_category ) { - services_discovery_t *p_sd = ( services_discovery_t* )p_this; - playlist_t *p_playlist = pl_Yield( p_this ); - DECMALLOC_ERR( p_sys, services_discovery_sys_t ); - p_sd->p_sys = p_sys; + struct shout_category_t category = { p_sd, psz_category }; + + /* Create the item */ + input_item_t *p_input = CreateInputItemFromShoutItem( p_sd, p_item ); + + /* Read every subitems, and add them in ItemAdded */ + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, + ItemAdded, &category ); + input_Read( p_sd, p_input ); + vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, + ItemAdded, &category ); - switch( i_type ) + vlc_gc_decref( p_input ); +} + +/***************************************************************************** + * Run: + *****************************************************************************/ +static void *Run( void *data ) +{ + services_discovery_t *p_sd = data; + services_discovery_sys_t *p_sys = p_sd->p_sys; + enum type_e i_type = p_sys->i_type; + int i, j; + int canc = vlc_savecancel(); + + if( !p_items[i_type].p_children ) { - case TV: - p_sys->p_input = input_ItemNewExt( p_playlist, - SHOUTCAST_TV_BASE_URL, _("Shoutcast TV"), - 0, NULL, -1 ); - break; - case RADIO: - default: - p_sys->p_input = input_ItemNewExt( p_playlist, - SHOUTCAST_BASE_URL, _("Shoutcast"), - 0, NULL, -1 ); - break; + AddSubitemsOfShoutItemURL( p_sd, &p_items[i_type], NULL ); + vlc_restorecancel(canc); + return NULL; } - input_ItemAddOption( p_sys->p_input, "no-playlist-autostart" ); - p_sys->p_input->b_prefers_tree = VLC_TRUE; - p_sys->p_node_cat = playlist_NodeAddInput( p_playlist, p_sys->p_input, - p_playlist->p_root_category, - PLAYLIST_APPEND, PLAYLIST_END, VLC_FALSE ); - p_sys->p_node_one = playlist_NodeAddInput( p_playlist, p_sys->p_input, - p_playlist->p_root_onelevel, - PLAYLIST_APPEND, PLAYLIST_END, VLC_FALSE ); - p_sys->p_node_cat->i_flags |= PLAYLIST_RO_FLAG; - p_sys->p_node_cat->i_flags |= PLAYLIST_SKIP_FLAG; - p_sys->p_node_one->i_flags |= PLAYLIST_RO_FLAG; - p_sys->p_node_one->i_flags |= PLAYLIST_SKIP_FLAG; - p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id; - - var_SetVoid( p_playlist, "intf-change" ); - - pl_Release( p_this ); - - input_Read( p_sd, p_sys->p_input, VLC_FALSE ); - return VLC_SUCCESS; + for( i = 0; p_items[i_type].p_children[i].psz_name; i++ ) + { + const struct shout_item_t * p_subitem = &p_items[i_type].p_children[i]; + if( !p_subitem->p_children ) + { + AddSubitemsOfShoutItemURL( p_sd, p_subitem, p_subitem->psz_name ); + continue; + } + for( j = 0; p_subitem->p_children[j].psz_name; j++ ) + { + input_item_t *p_input = CreateInputItemFromShoutItem( p_sd, &p_subitem->p_children[j] ); + services_discovery_AddItem( p_sd, + p_input, + p_subitem->psz_name ); + vlc_gc_decref( p_input ); + } + } + vlc_restorecancel(canc); + return NULL; } /***************************************************************************** @@ -162,11 +264,9 @@ static int Open( vlc_object_t *p_this, int i_type ) *****************************************************************************/ static void Close( vlc_object_t *p_this ) { - services_discovery_t *p_sd = ( services_discovery_t* )p_this; - services_discovery_sys_t *p_sys = p_sd->p_sys; - playlist_t *p_playlist = pl_Yield( p_sd ); - playlist_NodeDelete( p_playlist, p_sys->p_node_cat, VLC_TRUE, VLC_FALSE ); - playlist_NodeDelete( p_playlist, p_sys->p_node_one, VLC_TRUE, VLC_FALSE ); - pl_Release( p_sd ); - free( p_sys ); + services_discovery_t *p_sd = (services_discovery_t *)p_this; + services_discovery_sys_t *p_sys = p_sd->p_sys; + + vlc_join (p_sys->thread, NULL); + free (p_sys); }