X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fpodcast.c;h=bb2cbf2fb5653a1a5248f55c7be423895b6e2298;hb=f2c0462d85ea8a7a69d749e295b902e95dedff00;hp=50efcc888610025a56214e18174049b802e5e143;hpb=d51dba48f9065eba4c167d21fe5258807e0da43f;p=vlc diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 50efcc8886..bb2cbf2fb5 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -1,7 +1,7 @@ /***************************************************************************** * podcast.c: Podcast services discovery module ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2009 the VideoLAN team * $Id$ * * Authors: Antoine Cellerier @@ -29,9 +29,13 @@ # include "config.h" #endif -#include +#include +#include #include +#include + #include +#include #include /* ENOMEM */ @@ -58,20 +62,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( _("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, VLC_FALSE ); - change_autosave(); + URLS_TEXT, URLS_LONGTEXT, false ) + 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 () /***************************************************************************** @@ -87,13 +91,19 @@ struct services_discovery_sys_t char **ppsz_urls; int i_urls; - vlc_bool_t b_update; + input_item_t **pp_items; + int i_items; + + 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 ); @@ -113,14 +123,26 @@ static int Open( vlc_object_t *p_this ) p_sys->ppsz_urls = NULL; p_sys->i_input = 0; p_sys->pp_input = NULL; - p_sys->b_update = VLC_TRUE; + p_sys->pp_items = NULL; + p_sys->i_items = 0; + 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)) + { + var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys ); + vlc_cond_destroy( &p_sys->wait ); + vlc_mutex_destroy( &p_sys->lock ); + free (p_sys); + return VLC_EGENERIC; + } return VLC_SUCCESS; } @@ -132,59 +154,75 @@ 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] ) - { - input_StopThread( 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; - } + input_thread_t *p_input = p_sd->p_sys->pp_input[i]; + if( !p_input ) + continue; + + input_Stop( p_input, true ); + vlc_thread_join( p_input ); + vlc_object_release( p_input ); + + p_sd->p_sys->pp_input[i] = NULL; } free( p_sd->p_sys->pp_input ); for( i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] ); free( p_sys->ppsz_urls ); + for( i = 0; i < p_sys->i_items; i++ ) vlc_gc_decref( p_sys->pp_items[i] ); + free( p_sys->pp_items ); free( p_sys ); } /***************************************************************************** * 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; - 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 ) + vlc_mutex_lock( &p_sys->lock ); + mutex_cleanup_push( &p_sys->lock ); + for( ;; ) { - int i; - if( p_sys->b_update == VLC_TRUE ) - { - 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; - } + while( !p_sys->b_update ) + vlc_cond_wait( &p_sys->wait, &p_sys->lock ); + + int canc = vlc_savecancel (); + msg_Dbg( p_sd, "Update required" ); + char* psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" ); + ParseUrls( p_sd, psz_urls ); + free( psz_urls ); + p_sys->b_update = false; - for( i = 0; i < p_sd->p_sys->i_input; i++ ) + 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 ) + input_thread_t *p_input = p_sd->p_sys->pp_input[i]; + + if( p_input->b_eof || p_input->b_error ) { - input_StopThread( p_sd->p_sys->pp_input[i] ); - vlc_object_release( p_sd->p_sys->pp_input[i] ); + input_Stop( p_input, false ); + vlc_thread_join( p_input ); + vlc_object_release( p_input ); + p_sd->p_sys->pp_input[i] = NULL; REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i ); 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, @@ -194,38 +232,77 @@ 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; - p_sys->b_update = VLC_TRUE; + + 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; } static void ParseUrls( services_discovery_t *p_sd, char *psz_urls ) { services_discovery_sys_t *p_sys = p_sd->p_sys; + int i_new_items = 0; + input_item_t **pp_new_items = NULL; + + int i_new_urls = 0; + char **ppsz_new_urls = NULL; + + int i, j; + for( ;; ) { - int i; + if( !psz_urls ) break; + 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, + INSERT_ELEM( ppsz_new_urls, i_new_urls, i_new_urls, strdup( psz_urls ) ); - p_input = input_ItemNewExt( p_sd, psz_urls, - psz_urls, 0, NULL, -1 ); - input_ItemAddOption( p_input, "demux=podcast" ); + + input_item_t *p_input; + p_input = input_item_New( p_sd, psz_urls, psz_urls ); + input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED ); + + INSERT_ELEM( pp_new_items, i_new_items, i_new_items, p_input ); 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 ) ); + input_CreateAndStart( p_sd, p_input, NULL ) ); + } + else + { + INSERT_ELEM( ppsz_new_urls, i_new_urls, i_new_urls, + strdup( p_sys->ppsz_urls[i]) ); + INSERT_ELEM( pp_new_items, i_new_items, i_new_items, p_sys->pp_items[i] ); } if( psz_tok ) psz_urls = psz_tok+1; - else return; + else break; + } + + /* delete removed items and signal the removal */ + for( i = 0; ii_items; ++i ) + { + for( j = 0; j < i_new_items; ++j ) + if( pp_new_items[j] == p_sys->pp_items[i] ) break; + if( j == i_new_items ) + { + services_discovery_RemoveItem( p_sd, p_sys->pp_items[i] ); + vlc_gc_decref( p_sys->pp_items[i] ); + } } + free( p_sys->pp_items ); + for( int i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] ); + free( p_sys->ppsz_urls ); + + p_sys->ppsz_urls = ppsz_new_urls; + p_sys->i_urls = i_new_urls; + p_sys->pp_items = pp_new_items; + p_sys->i_items = i_new_items; }