X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fpodcast.c;h=ceaf68f027f089cf39749d2a6cfbdb14b443bf8f;hb=64fb2cd16e78f0862051020f33a998626b2340bf;hp=b64243e569b4aff8e05306262a451b85619b7a42;hpb=0ad4e448d1d8b54a75415370c7e2b56764c2c92b;p=vlc diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index b64243e569..ceaf68f027 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -33,6 +33,7 @@ #include #include #include +#include #include /* ENOMEM */ @@ -59,20 +60,20 @@ static void Close( vlc_object_t * ); #define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \ "separated by '|' (pipe)." ) -vlc_module_begin(); - set_shortname( "Podcast"); - set_description( N_("Podcasts") ); - set_category( CAT_PLAYLIST ); - set_subcategory( SUBCAT_PLAYLIST_SD ); +vlc_module_begin () + set_shortname( "Podcast") + set_description( N_("Podcasts") ) + set_category( CAT_PLAYLIST ) + set_subcategory( SUBCAT_PLAYLIST_SD ) add_string( "podcast-urls", NULL, NULL, URLS_TEXT, URLS_LONGTEXT, false ); - change_autosave(); + change_autosave () - set_capability( "services_discovery", 0 ); - set_callbacks( Open, Close ); + set_capability( "services_discovery", 0 ) + set_callbacks( Open, Close ) -vlc_module_end(); +vlc_module_end () /***************************************************************************** @@ -88,13 +89,16 @@ struct services_discovery_sys_t char **ppsz_urls; int i_urls; + vlc_thread_t thread; + vlc_mutex_t lock; + vlc_cond_t wait; bool b_update; }; /***************************************************************************** * Local prototypes *****************************************************************************/ -static void Run( services_discovery_t *p_intf ); +static void *Run( void * ); 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 ); @@ -114,14 +118,21 @@ static int Open( vlc_object_t *p_this ) p_sys->ppsz_urls = NULL; p_sys->i_input = 0; p_sys->pp_input = NULL; + vlc_mutex_init( &p_sys->lock ); + vlc_cond_init( &p_sys->wait ); p_sys->b_update = true; - p_sd->pf_run = Run; p_sd->p_sys = p_sys; - /* Give us a name */ - services_discovery_SetLocalizedName( p_sd, _("Podcasts") ); + /* 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 ); + if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW)) + { + free (p_sys); + return VLC_EGENERIC; + } return VLC_SUCCESS; } @@ -133,6 +144,14 @@ 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; + + vlc_cancel (p_sys->thread); + vlc_join (p_sys->thread, NULL); + + var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys ); + vlc_cond_destroy( &p_sys->wait ); + vlc_mutex_destroy( &p_sys->lock ); + for( i = 0; i < p_sys->i_input; i++ ) { if( p_sd->p_sys->pp_input[i] ) @@ -151,28 +170,27 @@ static void Close( vlc_object_t *p_this ) /***************************************************************************** * Run: main thread *****************************************************************************/ -static void Run( services_discovery_t *p_sd ) +static void *Run( void *data ) { + services_discovery_t *p_sd = data; services_discovery_sys_t *p_sys = p_sd->p_sys; - /* 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 ); - - while( vlc_object_alive (p_sd) ) + vlc_mutex_lock( &p_sys->lock ); + mutex_cleanup_push( &p_sys->lock ); + for( ;; ) { - int i; - if( p_sys->b_update == true ) - { - 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; - } + while( !p_sys->b_update ) + vlc_cond_wait( &p_sys->wait, &p_sys->lock ); - for( i = 0; i < p_sd->p_sys->i_input; i++ ) + int canc = vlc_savecancel (); + 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; + + for( int 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 ) @@ -184,8 +202,10 @@ static void Run( services_discovery_t *p_sd ) i--; } } - msleep( 500 ); + vlc_restorecancel (canc); } + vlc_cleanup_pop(); + assert(0); /* dead code */ } static int UrlsChange( vlc_object_t *p_this, char const *psz_var, @@ -195,7 +215,11 @@ static int UrlsChange( vlc_object_t *p_this, char const *psz_var, 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; + + vlc_mutex_lock( &p_sys->lock ); p_sys->b_update = true; + vlc_cond_signal( &p_sys->wait ); + vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; } @@ -219,10 +243,11 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls ) 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, + p_input = input_item_NewExt( p_sd, psz_urls, psz_urls, 0, NULL, -1 ); - input_ItemAddOption( p_input, "demux=podcast" ); + input_item_AddOption( p_input, "demux=podcast" ); services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ ); + vlc_gc_decref( p_input ); INSERT_ELEM( p_sys->pp_input, p_sys->i_input, p_sys->i_input, input_CreateThread( p_sd, p_input ) ); }