/*****************************************************************************
* podcast.c: Podcast services discovery module
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_playlist.h>
+#include <vlc_services_discovery.h>
+
#include <vlc_network.h>
+#include <assert.h>
#include <errno.h> /* ENOMEM */
#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();
+ 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 ()
/*****************************************************************************
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 );
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))
+ {
+ 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;
}
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] );
/*****************************************************************************
* 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 );
+
+ 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( 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,
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;
}
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" );
+ p_input = input_item_New( p_sd, psz_urls, psz_urls );
+ input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED );
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 ) );
+ input_CreateAndStart( p_sd, p_input, NULL ) );
}
if( psz_tok ) psz_urls = psz_tok+1;
else return;
projects / vlc / blobdiff