[vlc-devel] commit: podcast: per item add/remove request (Jakob Leben )
git version control
git at videolan.org
Sat Nov 7 09:13:06 CET 2009
vlc | branch: master | Jakob Leben <jleben at videolan.org> | Sat Nov 7 08:54:17 2009 +0100| [bc157d8781dd3a456af9e4c72ca4f4f677a7d5a6] | committer: Jakob Leben
podcast: per item add/remove request
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc157d8781dd3a456af9e4c72ca4f4f677a7d5a6
---
modules/services_discovery/podcast.c | 133 +++++++++++++++++++++++++++++++++-
1 files changed, 130 insertions(+), 3 deletions(-)
diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index bb2cbf2..17f9af4 100644
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -82,6 +82,11 @@ vlc_module_end ()
* Local structures
*****************************************************************************/
+enum {
+ UPDATE_URLS,
+ UPDATE_REQUEST
+}; /* FIXME Temporary. Updating by compound urls string to be removed later. */
+
struct services_discovery_sys_t
{
/* playlist node */
@@ -98,6 +103,8 @@ struct services_discovery_sys_t
vlc_mutex_t lock;
vlc_cond_t wait;
bool b_update;
+ char *psz_request;
+ int update_type;
};
/*****************************************************************************
@@ -106,7 +113,11 @@ struct services_discovery_sys_t
static void *Run( void * );
static int UrlsChange( vlc_object_t *, char const *, vlc_value_t,
vlc_value_t, void * );
+static int Request( vlc_object_t *, char const *, vlc_value_t,
+ vlc_value_t, void * );
+static void ParseRequest( services_discovery_t *p_sd );
static void ParseUrls( services_discovery_t *p_sd, char *psz_urls );
+static void SaveUrls( services_discovery_t *p_sd );
/*****************************************************************************
* Open: initialize and create stuff
@@ -128,6 +139,8 @@ static int Open( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->lock );
vlc_cond_init( &p_sys->wait );
p_sys->b_update = true;
+ p_sys->psz_request = NULL;
+ p_sys->update_type = UPDATE_URLS;
p_sd->p_sys = p_sys;
@@ -135,8 +148,12 @@ static int Open( vlc_object_t *p_this )
var_Create( p_sd, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+ var_Create( p_sd, "podcast-request", VLC_VAR_STRING );
+ var_AddCallback( p_sd, "podcast-request", Request, p_sys );
+
if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
{
+ var_DelCallback( p_sd, "podcast-request", Request, p_sys );
var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
vlc_cond_destroy( &p_sys->wait );
vlc_mutex_destroy( &p_sys->lock );
@@ -159,6 +176,7 @@ static void Close( vlc_object_t *p_this )
vlc_join (p_sys->thread, NULL);
var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+ var_DelCallback( p_sd, "podcast-request", Request, p_sys );
vlc_cond_destroy( &p_sys->wait );
vlc_mutex_destroy( &p_sys->lock );
@@ -179,6 +197,7 @@ static void Close( vlc_object_t *p_this )
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->psz_request );
free( p_sys );
}
@@ -199,9 +218,18 @@ static void *Run( void *data )
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 );
+
+ if( p_sys->update_type == UPDATE_URLS )
+ {
+ char* psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
+ ParseUrls( p_sd, psz_urls );
+ free( psz_urls );
+ }
+ else if( p_sys->update_type == UPDATE_REQUEST )
+ {
+ ParseRequest( p_sd );
+ }
+
p_sys->b_update = false;
for( int i = 0; i < p_sd->p_sys->i_input; i++ )
@@ -235,11 +263,32 @@ static int UrlsChange( vlc_object_t *p_this, char const *psz_var,
vlc_mutex_lock( &p_sys->lock );
p_sys->b_update = true;
+ p_sys->update_type = UPDATE_URLS;
vlc_cond_signal( &p_sys->wait );
vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
+static int Request( 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);
+ services_discovery_sys_t *p_sys = (services_discovery_sys_t *)p_data;
+
+ vlc_mutex_lock( &p_sys->lock );
+ free( p_sys->psz_request );
+ p_sys->psz_request = NULL;
+ if( newval.psz_string && *newval.psz_string ) {
+ p_sys->psz_request = strdup( newval.psz_string );
+ p_sys->b_update = true;
+ p_sys->update_type = UPDATE_REQUEST;
+ 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;
@@ -306,3 +355,81 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
p_sys->pp_items = pp_new_items;
p_sys->i_items = i_new_items;
}
+
+static void ParseRequest( services_discovery_t *p_sd )
+{
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
+
+ char *psz_request = p_sys->psz_request;
+
+ int i;
+
+ char *psz_tok = strchr( psz_request, ':' );
+ if( !psz_tok ) return;
+ *psz_tok = '\0';
+ if( !strcmp( psz_request, "ADD" ) )
+ {
+ psz_request = psz_tok + 1;
+ for( i = 0; i<p_sys->i_urls; i++ )
+ if( !strcmp(p_sys->ppsz_urls[i],psz_request) )
+ break;
+ if( i == p_sys->i_urls )
+ {
+ INSERT_ELEM( p_sys->ppsz_urls, p_sys->i_urls, p_sys->i_urls,
+ strdup( psz_request ) );
+
+ input_item_t *p_input;
+ p_input = input_item_New( p_sd, psz_request, psz_request );
+ input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED );
+
+ INSERT_ELEM( p_sys->pp_items, p_sys->i_items, p_sys->i_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_CreateAndStart( p_sd, p_input, NULL ) );
+ SaveUrls( p_sd );
+ }
+ }
+ else if ( !strcmp( psz_request, "RM" ) )
+ {
+ psz_request = psz_tok + 1;
+ for( i = 0; i<p_sys->i_urls; i++ )
+ if( !strcmp(p_sys->ppsz_urls[i],psz_request) )
+ break;
+ if( i != p_sys->i_urls )
+ {
+ services_discovery_RemoveItem( p_sd, p_sys->pp_items[i] );
+ vlc_gc_decref( p_sys->pp_items[i] );
+ REMOVE_ELEM( p_sys->ppsz_urls, p_sys->i_urls, i );
+ REMOVE_ELEM( p_sys->pp_items, p_sys->i_items, i );
+ }
+ SaveUrls( p_sd );
+ }
+
+ free( p_sys->psz_request );
+ p_sys->psz_request = NULL;
+}
+
+static void SaveUrls( services_discovery_t *p_sd )
+{
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
+ int i;
+ char *psz_urls;
+ int len = 0;
+
+ for( i=0; i < p_sys->i_urls; i++ )
+ len += strlen( p_sys->ppsz_urls[i] ) + 1;
+
+ psz_urls = (char*) calloc( len, sizeof(char) );
+
+ for( i=0; i < p_sys->i_urls; i++ )
+ {
+ strcat( psz_urls, p_sys->ppsz_urls[i] );
+ if( i < p_sys->i_urls - 1 ) strcat( psz_urls, "|" );
+ }
+
+ config_PutPsz( p_sd, "podcast-urls", psz_urls );
+ config_SaveConfigFile( p_sd, "podcast" );
+
+ free( psz_urls );
+}
More information about the vlc-devel
mailing list