X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fpodcast.c;h=aa96ea5a4b5050a2032ccd7445b2096c7b86e533;hb=7ab4f13d30c26e769f8ae7f48499109e3b177ab8;hp=06674f9bb99e81a404080cb347361e12ba898cdc;hpb=667f188961341ded83b0b17527a71961701e945f;p=vlc diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 06674f9bb9..aa96ea5a4b 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -18,20 +18,24 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Includes *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include +#include -#include "network.h" +#include +#include #include /* ENOMEM */ @@ -51,25 +55,27 @@ *****************************************************************************/ /* 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_("Podcast '|' (pipe) seperated URLs list") +#define URLS_LONGTEXT N_("Enter the list of podcasts to retrieve, " \ + "separated by '|' (pipe)." ) -vlc_module_begin(); - set_shortname( "Podcast"); - set_description( _("Podcast Service Discovery") ); - 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 ); + 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 () /***************************************************************************** @@ -79,19 +85,25 @@ vlc_module_end(); struct services_discovery_sys_t { /* playlist node */ - playlist_item_t *p_node; - input_thread_t *p_input; + input_thread_t **pp_input; + int i_input; char **ppsz_urls; int i_urls; + + vlc_thread_t thread; + vlc_mutex_t lock; + vlc_cond_t wait; + bool b_update; }; /***************************************************************************** * Local prototypes *****************************************************************************/ - -/* Main functions */ - 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 ); /***************************************************************************** * Open: initialize and create stuff @@ -101,82 +113,28 @@ 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; - vlc_value_t val; - playlist_t *p_playlist; - playlist_view_t *p_view; - 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; + 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; - /* 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; - } + /* 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_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY ); - p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY, - _("Podcast"), p_view->p_root ); - for( i = 0; i < p_sys->i_urls; i++ ) + if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW)) { - asprintf( &psz_buf, "%s", p_sys->ppsz_urls[i] ); - p_item = playlist_ItemNew( p_playlist, psz_buf, - p_sys->ppsz_urls[i] ); - free( psz_buf ); - playlist_ItemAddOption( p_item, "demux=podcast" ); - playlist_NodeAddItem( p_playlist, p_item, - p_sys->p_node->pp_parents[0]->i_view, - p_sys->p_node, PLAYLIST_APPEND, - PLAYLIST_END ); - - /* We need to declare the parents of the node as the same of the - * parent's ones */ - playlist_CopyParents( p_sys->p_node, p_item ); - p_sys->p_input = input_CreateThread( p_playlist, &p_item->input ); + free (p_sys); + return VLC_EGENERIC; } - - - p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG; - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - - vlc_object_release( p_playlist ); - return VLC_SUCCESS; } @@ -187,22 +145,25 @@ 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; - if( p_sd->p_sys->p_input ) - { - input_StopThread( p_sd->p_sys->p_input ); - input_DestroyThread( p_sd->p_sys->p_input ); - vlc_object_detach( p_sd->p_sys->p_input ); - vlc_object_destroy( p_sd->p_sys->p_input ); - p_sd->p_sys->p_input = NULL; - } - if( p_playlist ) + + 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++ ) { - playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE ); - vlc_object_release( p_playlist ); + 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; + } } + 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 ); free( p_sys ); @@ -211,19 +172,88 @@ 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; + + vlc_mutex_lock( &p_sys->lock ); + mutex_cleanup_push( &p_sys->lock ); + for( ;; ) + { + 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" ); + 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 ) + { + 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; + REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i ); + i--; + } + } + vlc_restorecancel (canc); + } + vlc_cleanup_pop(); + assert(0); /* dead code */ +} + +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; + + 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 ) { - while( !p_sd->b_die ) + services_discovery_sys_t *p_sys = p_sd->p_sys; + for( ;; ) { - if( p_sd->p_sys->p_input && - ( p_sd->p_sys->p_input->b_eof || p_sd->p_sys->p_input->b_error ) ) + 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 ) { - input_StopThread( p_sd->p_sys->p_input ); - input_DestroyThread( p_sd->p_sys->p_input ); - vlc_object_detach( p_sd->p_sys->p_input ); - vlc_object_destroy( p_sd->p_sys->p_input ); - p_sd->p_sys->p_input = NULL; + /* 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_item_NewExt( p_sd, psz_urls, + psz_urls, 0, NULL, -1 ); + 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 ) ); } - msleep( 100000 ); + if( psz_tok ) psz_urls = psz_tok+1; + else return; } }