X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fpodcast.c;h=b64243e569b4aff8e05306262a451b85619b7a42;hb=0ad4e448d1d8b54a75415370c7e2b56764c2c92b;hp=8c176a0f5e49379500ddfb25fe52a3a7b8ada81c;hpb=fe92f9c92dc93bfc5a6948832246788e3010ace0;p=vlc diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 8c176a0f5e..b64243e569 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -25,7 +25,12 @@ * Includes *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -47,8 +52,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, " \ @@ -56,12 +61,12 @@ vlc_module_begin(); set_shortname( "Podcast"); - set_description( _("Podcasts") ); + set_description( N_("Podcasts") ); set_category( CAT_PLAYLIST ); set_subcategory( SUBCAT_PLAYLIST_SD ); add_string( "podcast-urls", NULL, NULL, - URLS_TEXT, URLS_LONGTEXT, VLC_FALSE ); + URLS_TEXT, URLS_LONGTEXT, false ); change_autosave(); set_capability( "services_discovery", 0 ); @@ -78,17 +83,21 @@ struct services_discovery_sys_t { /* playlist node */ input_thread_t **pp_input; + int i_input; char **ppsz_urls; int i_urls; + + bool 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 @@ -98,11 +107,15 @@ static int Open( vlc_object_t *p_this ) services_discovery_t *p_sd = ( services_discovery_t* )p_this; services_discovery_sys_t *p_sys = malloc( sizeof( services_discovery_sys_t ) ); - + if( !p_sys ) + return VLC_ENOMEM; + p_sys->i_urls = 0; p_sys->ppsz_urls = NULL; + p_sys->i_input = 0; p_sys->pp_input = NULL; - + p_sys->b_update = true; + p_sd->pf_run = Run; p_sd->p_sys = p_sys; @@ -120,12 +133,12 @@ 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; 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_release( p_sd->p_sys->pp_input[i] ); p_sd->p_sys->pp_input[i] = NULL; } } @@ -142,62 +155,78 @@ static void Run( services_discovery_t *p_sd ) { services_discovery_sys_t *p_sys = p_sd->p_sys; - int i, j; - char *psz_buf; - char *psz_tmp = psz_buf = var_CreateGetString( p_sd, "podcast-urls" ); - - i = 0; - p_sys->i_urls = psz_buf[0] ? 1 : 0; - while( psz_buf[i] != 0 ) - if( psz_buf[i++] == '|' ) - p_sys->i_urls++; + /* Launch the callback associated with this variable */ + var_Create( p_sd, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys ); - p_sys->ppsz_urls = (char **)malloc( p_sys->i_urls * sizeof( char * ) ); - - i = 0; - j = 0; - while( psz_buf[i] != 0 ) + while( vlc_object_alive (p_sd) ) { - if( psz_buf[i] == '|' ) + int i; + if( p_sys->b_update == true ) { - psz_buf[i] = 0; - p_sys->ppsz_urls[j] = strdup( psz_tmp ); - i++; - j++; - psz_tmp = psz_buf+i; + msg_Dbg( p_sd, "Update required" ); + char* psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" ); + if( psz_urls != NULL ) + ParseUrls( p_sd, psz_urls ); + free( psz_urls ); + p_sys->b_update = false; } - else - i++; - } - p_sys->ppsz_urls[j] = strdup( psz_tmp ); - free( psz_buf ); - 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_sd, psz_buf, - p_sys->ppsz_urls[i], 0, NULL, -1 ); - input_ItemAddOption( p_input, "demux=podcast" ); - services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ ); - p_sys->pp_input[i] = input_CreateThread( p_sd, p_input ); - } - - while( !p_sd->b_die ) - { - int i; - for( i = 0; i < p_sd->p_sys->i_urls; i++ ) + for( i = 0; i < p_sd->p_sys->i_input; i++ ) { - 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 ) ) + 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_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 = 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; } }