* Includes
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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 */
*****************************************************************************/
/* 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, " \
"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 ()
/*****************************************************************************
{
/* playlist node */
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
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_sd->pf_run = Run;
+ vlc_mutex_init( &p_sys->lock );
+ vlc_cond_init( &p_sys->wait );
+ p_sys->b_update = true;
+
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;
}
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++ )
+
+ 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] );
- 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;
}
}
/*****************************************************************************
* 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;
- 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++;
+ 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 );
- p_sys->ppsz_urls = (char **)malloc( p_sys->i_urls * sizeof( char * ) );
+ 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;
- i = 0;
- j = 0;
- while( psz_buf[i] != 0 )
- {
- if( psz_buf[i] == '|' )
+ for( int i = 0; i < p_sd->p_sys->i_input; i++ )
{
- psz_buf[i] = 0;
- p_sys->ppsz_urls[j] = strdup( psz_tmp );
- i++;
- j++;
- psz_tmp = psz_buf+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--;
+ }
}
- else
- i++;
+ vlc_restorecancel (canc);
}
- p_sys->ppsz_urls[j] = strdup( psz_tmp );
- free( psz_buf );
+ vlc_cleanup_pop();
+ assert(0); /* dead code */
+}
- 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 );
- }
+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;
- while( !p_sd->b_die )
+ 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;
+ for( ;; )
{
int i;
- for( i = 0; i < p_sd->p_sys->i_urls; 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 )
{
- 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 ) )
- {
- input_StopThread( p_sd->p_sys->pp_input[i] );
- input_DestroyThread( p_sd->p_sys->pp_input[i] );
- p_sd->p_sys->pp_input[i] = 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;
}
}
projects / vlc / blobdiff