X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fpodcast.c;h=f0b33c331ca6cf064f57d15ce24db0402c40723e;hb=c90b3db3af8af023ce9d76b989a3000a896c65df;hp=68f13dd7c6d0091222046d44c63524bd3337f9d5;hpb=19f542a35b43fadc821547fea49f7cbd90ad0b69;p=vlc diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 68f13dd7c6..f0b33c331c 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -24,15 +24,14 @@ /***************************************************************************** * Includes *****************************************************************************/ -#define _GNU_SOURCE -#include /* malloc(), free() */ -#include -#include - -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "network.h" +#include +#include +#include #include /* ENOMEM */ @@ -52,8 +51,8 @@ *****************************************************************************/ /* Callbacks */ - static int Open ( vlc_object_t * ); - static void Close( vlc_object_t * ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); #define URLS_TEXT N_("Podcast URLs list") #define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \ @@ -67,6 +66,7 @@ vlc_module_begin(); add_string( "podcast-urls", NULL, NULL, URLS_TEXT, URLS_LONGTEXT, VLC_FALSE ); + change_autosave(); set_capability( "services_discovery", 0 ); set_callbacks( Open, Close ); @@ -81,20 +81,22 @@ vlc_module_end(); struct services_discovery_sys_t { /* playlist node */ - playlist_item_t *p_node_cat; - playlist_item_t *p_node_one; input_thread_t **pp_input; + int i_input; char **ppsz_urls; int i_urls; + + vlc_bool_t b_update; }; /***************************************************************************** * Local prototypes *****************************************************************************/ - -/* Main functions */ - static void Run ( services_discovery_t *p_intf ); +static void Run( services_discovery_t *p_intf ); +static int UrlsChange( vlc_object_t *, char const *, vlc_value_t, + vlc_value_t, void * ); +static void ParseUrls( services_discovery_t *p_sd, char *psz_urls ); /***************************************************************************** * Open: initialize and create stuff @@ -105,82 +107,17 @@ static int Open( vlc_object_t *p_this ) services_discovery_sys_t *p_sys = malloc( sizeof( services_discovery_sys_t ) ); - vlc_value_t val; - playlist_t *p_playlist; - playlist_item_t *p_item; - - int i, j; - char *psz_buf; - char *psz_tmp = psz_buf = var_CreateGetString( p_sd, "podcast-urls" ); - - i = 0; - p_sys->i_urls = 1; - while( psz_buf[i] != 0 ) - if( psz_buf[i++] == '|' ) - p_sys->i_urls++; - - p_sys->ppsz_urls = (char **)malloc( p_sys->i_urls * sizeof( char * ) ); - - i = 0; - j = 0; - while( psz_buf[i] != 0 ) - { - if( psz_buf[i] == '|' ) - { - psz_buf[i] = 0; - p_sys->ppsz_urls[j] = strdup( psz_tmp ); - i++; - j++; - psz_tmp = psz_buf+i; - } - else - i++; - } - p_sys->ppsz_urls[j] = strdup( psz_tmp ); - free( psz_buf ); + p_sys->i_urls = 0; + p_sys->ppsz_urls = NULL; + p_sys->i_input = 0; + p_sys->pp_input = NULL; + p_sys->b_update = VLC_TRUE; p_sd->pf_run = Run; p_sd->p_sys = p_sys; - /* Create our playlist node */ - p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) - { - msg_Warn( p_sd, "unable to find playlist, cancelling"); - return VLC_EGENERIC; - } - - p_sys->p_node_cat = playlist_NodeCreate( p_playlist, _("Podcast"), - p_playlist->p_root_category ); - p_sys->p_node_one = playlist_NodeCreate( p_playlist, _("Podcast"), - p_playlist->p_root_onelevel ); - p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id; - - p_sys->p_node_one->i_flags |= PLAYLIST_RO_FLAG; - p_sys->p_node_cat->i_flags |= PLAYLIST_RO_FLAG; - p_sys->p_node_one->i_flags |= PLAYLIST_SKIP_FLAG; - p_sys->p_node_cat->i_flags |= PLAYLIST_SKIP_FLAG; - p_sys->pp_input = malloc( p_sys->i_urls * sizeof( input_thread_t * ) ); - for( i = 0; i < p_sys->i_urls; i++ ) - { - input_item_t *p_input; - asprintf( &psz_buf, "%s", p_sys->ppsz_urls[i] ); - p_input = input_ItemNewExt( p_playlist, psz_buf, - p_sys->ppsz_urls[i], 0, NULL, -1 ); - input_ItemAddOption( p_input, "demux=podcast" ); - p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_cat, - PLAYLIST_APPEND, PLAYLIST_END ); - p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_one, - PLAYLIST_APPEND, PLAYLIST_END ); - free( psz_buf ); - p_sys->pp_input[i] = input_CreateThread( p_playlist, p_input ); - } - - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - - vlc_object_release( p_playlist ); + /* Give us a name */ + services_discovery_SetLocalizedName( p_sd, _("Podcasts") ); return VLC_SUCCESS; } @@ -192,27 +129,17 @@ 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 = (playlist_t *) vlc_object_find( p_sd, - VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); int i; - for( i = 0; i < p_sys->i_urls; i++ ) + for( i = 0; i < p_sys->i_input; i++ ) { if( p_sd->p_sys->pp_input[i] ) { input_StopThread( p_sd->p_sys->pp_input[i] ); - input_DestroyThread( p_sd->p_sys->pp_input[i] ); - vlc_object_detach( p_sd->p_sys->pp_input[i] ); - vlc_object_destroy( p_sd->p_sys->pp_input[i] ); + vlc_object_release( p_sd->p_sys->pp_input[i] ); p_sd->p_sys->pp_input[i] = NULL; } } free( p_sd->p_sys->pp_input ); - if( p_playlist ) - { - playlist_NodeDelete( p_playlist, p_sys->p_node_cat, VLC_TRUE, VLC_TRUE ); - playlist_NodeDelete( p_playlist, p_sys->p_node_one, VLC_TRUE, VLC_TRUE ); - vlc_object_release( p_playlist ); - } for( i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] ); free( p_sys->ppsz_urls ); free( p_sys ); @@ -223,22 +150,80 @@ static void Close( vlc_object_t *p_this ) *****************************************************************************/ static void Run( services_discovery_t *p_sd ) { + services_discovery_sys_t *p_sys = p_sd->p_sys; + + char *psz_urls = var_CreateGetString( p_sd, "podcast-urls" ); + free( psz_urls ); /* Gruik ? */ + var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys ); + while( !p_sd->b_die ) { int i; - for( i = 0; i < p_sd->p_sys->i_urls; i++ ) + if( p_sys->b_update == VLC_TRUE ) { - if( p_sd->p_sys->pp_input[i] && - ( p_sd->p_sys->pp_input[i]->b_eof - || p_sd->p_sys->pp_input[i]->b_error ) ) + msg_Dbg( p_sd, "Update required" ); + psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" ); + if( psz_urls != NULL ) + ParseUrls( p_sd, psz_urls ); + free( psz_urls ); + p_sys->b_update = VLC_FALSE; + } + + for( i = 0; i < p_sd->p_sys->i_input; i++ ) + { + if( p_sd->p_sys->pp_input[i]->b_eof + || p_sd->p_sys->pp_input[i]->b_error ) { input_StopThread( p_sd->p_sys->pp_input[i] ); - input_DestroyThread( p_sd->p_sys->pp_input[i] ); - vlc_object_detach( p_sd->p_sys->pp_input[i] ); - vlc_object_destroy( p_sd->p_sys->pp_input[i] ); + vlc_object_release( p_sd->p_sys->pp_input[i] ); p_sd->p_sys->pp_input[i] = NULL; + REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i ); + i--; } } - msleep( 100000 ); + msleep( 500 ); + } +} + +static int UrlsChange( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); + VLC_UNUSED(newval); + services_discovery_sys_t *p_sys = (services_discovery_sys_t *)p_data; + p_sys->b_update = VLC_TRUE; + return VLC_SUCCESS; +} + +static void ParseUrls( services_discovery_t *p_sd, char *psz_urls ) +{ + services_discovery_sys_t *p_sys = p_sd->p_sys; + for( ;; ) + { + int i; + char *psz_tok = strchr( psz_urls, '|' ); + if( psz_tok ) *psz_tok = '\0'; + for( i = 0; i < p_sys->i_urls; i++ ) + if( !strcmp( psz_urls, p_sys->ppsz_urls[i] ) ) + break; + if( i == p_sys->i_urls ) + { + /* Only add new urls. + * FIXME: We don't delete urls which have been removed from + * the config since we don't have a way to know which inputs + * they spawned */ + input_item_t *p_input; + INSERT_ELEM( p_sys->ppsz_urls, p_sys->i_urls, p_sys->i_urls, + strdup( psz_urls ) ); + p_input = input_ItemNewExt( p_sd, psz_urls, + psz_urls, 0, NULL, -1 ); + input_ItemAddOption( p_input, "demux=podcast" ); + services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ ); + INSERT_ELEM( p_sys->pp_input, p_sys->i_input, p_sys->i_input, + input_CreateThread( p_sd, p_input ) ); + } + if( psz_tok ) psz_urls = psz_tok+1; + else return; } }