X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fshout.c;h=378c2351c98591f3e116ac9ed6c31982b9d91bc3;hb=26b5b697bd055842e538438d4a128be113148c6b;hp=6172df0afb7d7e241a0c40a490610ae7614478f0;hpb=5777fa8de8116dccc731262b41ac4e9d4cd25331;p=vlc diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c index 6172df0afb..378c2351c9 100644 --- a/modules/services_discovery/shout.c +++ b/modules/services_discovery/shout.c @@ -27,78 +27,131 @@ * Includes *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include /***************************************************************************** * Module descriptor *****************************************************************************/ -enum type_e { ShoutRadio = 0, ShoutTV = 1, Freebox = 2 }; +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 * ); -static const struct +struct shout_item_t { const char *psz_url; const char *psz_name; const char *ppsz_options[2]; -} p_items[] = { - { "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml", - N_("Shoutcast Radio"), { NULL } }, - { "http/shout-winamp://www.shoutcast.com/sbin/newtvlister.phtml?alltv=1", - N_("Shoutcast TV"), { NULL } }, - { "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u", - N_("Freebox TV"), { "m3u-extvlcopt=1", NULL } }, + 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" ), + itemWithOption( N_("Freebox TV"),"http://mafreebox.freebox.fr/freeboxtv/playlist.m3u", "deinterlace=1"), + 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; + const struct shout_item_t * p_parent; }; /* 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_category( CAT_PLAYLIST ); - set_subcategory( SUBCAT_PLAYLIST_SD ); +#undef OPEN - add_obsolete_integer( "shoutcast-limit" ); +static int vlc_sd_probe_Open( vlc_object_t * ); - set_shortname( "Shoutcast"); - set_description( _("Shoutcast radio listings") ); - set_capability( "services_discovery", 0 ); - set_callbacks( OpenShoutRadio, Close ); - add_shortcut( "shoutcast" ); +vlc_module_begin () + set_category( CAT_PLAYLIST ) + set_subcategory( SUBCAT_PLAYLIST_SD ) - add_submodule(); - set_shortname( "ShoutcastTV" ); - set_description( _("Shoutcast TV listings") ); - set_capability( "services_discovery", 0 ); - set_callbacks( OpenShoutTV, Close ); - add_shortcut( "shoutcasttv" ); + add_obsolete_integer( "shoutcast-limit" ) - add_submodule(); - set_shortname( "Freebox"); - set_description( _("Freebox TV listing (French ISP free.fr services)") ); - set_capability( "services_discovery", 0 ); - set_callbacks( OpenFreebox, Close ); - add_shortcut( "freebox" ); + set_shortname( "Shoutcast") + set_description( N_("Shoutcast Radio") ) + 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") ) + 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") ) + set_capability( "services_discovery", 0 ) + set_callbacks( OpenFreebox, Close ) + add_shortcut( "freebox" ) + + VLC_SD_PROBE_SUBMODULE +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -static void Run( services_discovery_t *p_sd ); - +static void *Run( void * ); +struct services_discovery_sys_t +{ + vlc_thread_t thread; + enum type_e i_type; +}; /***************************************************************************** * Open: initialize and create stuff @@ -106,9 +159,17 @@ static void Run( services_discovery_t *p_sd ); static int Open( vlc_object_t *p_this, enum type_e i_type ) { services_discovery_t *p_sd = ( services_discovery_t* )p_this; - services_discovery_SetLocalizedName( p_sd, _(p_items[i_type].psz_name) ); - p_sd->pf_run = Run; - p_sd->p_sys = (void *)i_type; + + 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; } @@ -117,37 +178,115 @@ static int Open( vlc_object_t *p_this, enum type_e i_type ) *****************************************************************************/ static void ItemAdded( const vlc_event_t * p_event, void * user_data ) { - services_discovery_t *p_sd = user_data; - services_discovery_AddItem( p_sd, - p_event->u.input_item_subitem_added.p_new_child, - NULL /* no category */ ); + struct shout_category_t * params = user_data; + const struct shout_item_t * p_parent = params->p_parent; + input_item_t * p_input = p_event->u.input_item_subitem_added.p_new_child; + + for(int i = 0; p_parent->ppsz_options[i] != NULL; i++) + input_item_AddOption( p_input, p_parent->ppsz_options[i], VLC_INPUT_OPTION_TRUSTED); + + services_discovery_AddItem( params->p_sd, p_input, params->psz_category ); +} + +/***************************************************************************** + * CreateInputItemFromShoutItem: + *****************************************************************************/ +static input_item_t * CreateInputItemFromShoutItem( services_discovery_t *p_sd, + const struct shout_item_t * p_item ) +{ + /* 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(int 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; } /***************************************************************************** - * Run: + * AddSubitemsOfShoutItemURL: *****************************************************************************/ -static void Run( services_discovery_t *p_sd ) +static void AddSubitemsOfShoutItemURL( services_discovery_t *p_sd, + const struct shout_item_t * p_item, + const char * psz_category ) { - enum type_e i_type = (enum type_e)p_sd->p_sys; - int i; - input_item_t *p_input = input_ItemNewExt( p_sd, - p_items[i_type].psz_url, _(p_items[i_type].psz_name), - 0, NULL, -1 ); - for( i = 0; p_items[i_type].ppsz_options[i] != NULL; i++ ) - input_ItemAddOption( p_input, p_items[i_type].ppsz_options[i] ); - input_ItemAddOption( p_input, "no-playlist-autostart" ); + struct shout_category_t category = { p_sd, psz_category, p_item }; + + /* 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, p_sd ); - input_Read( p_sd, p_input, VLC_TRUE ); + ItemAdded, &category ); + input_Read( p_sd, p_input ); vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, - ItemAdded, p_sd ); + ItemAdded, &category ); + 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 ) + { + AddSubitemsOfShoutItemURL( p_sd, &p_items[i_type], NULL ); + vlc_restorecancel(canc); + return NULL; + } + 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; +} + /***************************************************************************** * Close: *****************************************************************************/ 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; + + vlc_join (p_sys->thread, NULL); + free (p_sys); +} + +static int vlc_sd_probe_Open( vlc_object_t *obj ) +{ + vlc_probe_t *probe = (vlc_probe_t *)obj; + + vlc_sd_probe_Add( probe, "shoutcast{longname=\"Shoutcast Radio\"}", + N_("Shoutcast Radio"), SD_CAT_INTERNET ); + vlc_sd_probe_Add( probe, "shoutcasttv{longname=\"Shoutcast TV\"}", + N_("Shoutcast TV"), SD_CAT_INTERNET ); + vlc_sd_probe_Add( probe, "frenchtv{longname=\"French TV\"}", + N_("French TV"), SD_CAT_INTERNET ); + return VLC_PROBE_CONTINUE; }