#include "playlist_internal.h"
#include "../libvlc.h"
-static void* RunSD( vlc_object_t *p_this );
+
+static void services_discovery_Destructor ( services_discovery_t * p_sd );
/*
* Services discovery
services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name )
{
services_discovery_t *p_sd;
+ assert( psz_module_name );
p_sd = vlc_custom_create( p_super, sizeof( *p_sd ), VLC_OBJECT_GENERIC,
"services discovery" );
if( !p_sd )
return NULL;
- p_sd->pf_run = NULL;
- p_sd->psz_localized_name = NULL;
+ p_sd->psz_localized_name = strdup( "Unnamed service discovery" ); // FIXME: Set that back to NULL
+ p_sd->psz_module = strdup( psz_module_name );
vlc_event_manager_init( &p_sd->event_manager, p_sd, (vlc_object_t *)p_sd );
vlc_event_manager_register_event_type( &p_sd->event_manager,
vlc_event_manager_register_event_type( &p_sd->event_manager,
vlc_ServicesDiscoveryEnded );
- p_sd->p_module = module_Need( p_sd, "services_discovery", psz_module_name, true );
-
- if( p_sd->p_module == NULL )
- {
- msg_Err( p_super, "no suitable services discovery module" );
- vlc_object_release( p_sd );
- return NULL;
- }
- p_sd->psz_module = strdup( psz_module_name );
- p_sd->b_die = false; /* FIXME */
-
vlc_object_attach( p_sd, p_super );
+
return p_sd;
}
-/***********************************************************************
- * Destroy
- ***********************************************************************/
-void services_discovery_Destroy ( services_discovery_t * p_sd )
+static void ObjectKillChildrens( vlc_object_t *p_obj )
{
- vlc_event_manager_fini( &p_sd->event_manager );
-
- free( p_sd->psz_module );
- free( p_sd->psz_localized_name );
+ vlc_list_t *p_list;
+ int i;
+ vlc_object_kill( p_obj );
- vlc_object_detach( p_sd );
- vlc_object_release( p_sd );
+ p_list = vlc_list_children( p_obj );
+ for( i = 0; i < p_list->i_count; i++ )
+ ObjectKillChildrens( p_list->p_values[i].p_object );
+ vlc_list_release( p_list );
}
/***********************************************************************
- * Start
+ * Stop
***********************************************************************/
-int services_discovery_Start ( services_discovery_t * p_sd )
+bool services_discovery_Start ( services_discovery_t * p_sd )
{
- if ((p_sd->pf_run != NULL)
- && vlc_thread_create( p_sd, "services_discovery", RunSD,
- VLC_THREAD_PRIORITY_LOW, false))
+ assert(!p_sd->p_module);
+
+ p_sd->p_module = module_need( p_sd, "services_discovery", p_sd->psz_module, true );
+
+ if( p_sd->p_module == NULL )
{
- msg_Err( p_sd, "cannot create services discovery thread" );
- vlc_object_release( p_sd );
- return VLC_EGENERIC;
+ msg_Err( p_sd, "no suitable services discovery module" );
+ return false;
}
- return VLC_SUCCESS;
+
+ vlc_event_t event = {
+ .type = vlc_ServicesDiscoveryStarted
+ };
+ vlc_event_send( &p_sd->event_manager, &event );
+ return true;
}
-
+
/***********************************************************************
* Stop
***********************************************************************/
-static void ObjectKillChildrens( vlc_object_t *p_obj )
+void services_discovery_Stop ( services_discovery_t * p_sd )
{
- vlc_list_t *p_list;
- int i;
- vlc_object_kill( p_obj );
+ vlc_event_t event = {
+ .type = vlc_ServicesDiscoveryEnded
+ };
+
+ ObjectKillChildrens( VLC_OBJECT(p_sd) );
+
+ vlc_event_send( &p_sd->event_manager, &event );
- p_list = vlc_list_children( p_obj );
- for( i = 0; i < p_list->i_count; i++ )
- ObjectKillChildrens( p_list->p_values[i].p_object );
- vlc_list_release( p_list );
+ module_unneed( p_sd, p_sd->p_module );
+ p_sd->p_module = NULL;
}
-void services_discovery_Stop ( services_discovery_t * p_sd )
+/***********************************************************************
+ * Destructor
+ ***********************************************************************/
+static void services_discovery_Destructor ( services_discovery_t * p_sd )
{
- ObjectKillChildrens( VLC_OBJECT(p_sd) );
- if( p_sd->pf_run ) vlc_thread_join( p_sd );
+ assert(!p_sd->p_module); /* Forgot to call Stop */
- module_Unneed( p_sd, p_sd->p_module );
+ vlc_event_manager_fini( &p_sd->event_manager );
+
+ free( p_sd->psz_module );
+ free( p_sd->psz_localized_name );
+
+ vlc_object_release( p_sd );
}
/***********************************************************************
vlc_event_send( &p_sd->event_manager, &event );
}
-/***********************************************************************
- * RunSD (Private)
- ***********************************************************************/
-static void* RunSD( vlc_object_t *p_this )
-{
- services_discovery_t *p_sd = (services_discovery_t *)p_this;
- vlc_event_t event = {
- .type = vlc_ServicesDiscoveryStarted
- };
- int canc = vlc_savecancel ();
- vlc_event_send( &p_sd->event_manager, &event );
- vlc_restorecancel (canc);
-
- p_sd->pf_run( p_sd );
-
- canc = vlc_savecancel ();
- event.type = vlc_ServicesDiscoveryEnded;
- vlc_event_send( &p_sd->event_manager, &event );
- vlc_restorecancel (canc);
- return NULL;
-}
-
/*
* Playlist - Services discovery bridge
*/
if( !p_sd )
continue;
+ /* FIXME: Thanks to previous changeset this is broken */
char * psz = services_discovery_GetLocalizedName( p_sd );
assert( psz );
PL_LOCK;
vlc_ServicesDiscoveryItemAdded,
playlist_sd_item_added,
p_one );
-
+
vlc_event_attach( services_discovery_EventManager( p_sd ),
vlc_ServicesDiscoveryItemAdded,
playlist_sd_item_added,
playlist_sd_item_removed,
p_cat );
- services_discovery_Start( p_sd );
-
+ bool ret = services_discovery_Start( p_sd );
+ if(!ret)
+ {
+ vlc_object_release( p_sd );
+ return VLC_EGENERIC;
+ }
+
/* Free in playlist_ServicesDiscoveryRemove */
p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) );
if( !p_sds )
p_sds->p_cat = p_cat;
PL_LOCK;
- TAB_APPEND( p_playlist->i_sds, p_playlist->pp_sds, p_sds );
+ TAB_APPEND( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds, p_sds );
PL_UNLOCK;
+
}
return retval;
int i;
PL_LOCK;
- for( i = 0 ; i< p_playlist->i_sds ; i ++ )
+ for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
+ if( !strcmp( psz_module, pl_priv(p_playlist)->pp_sds[i]->p_sd->psz_module ) )
{
- p_sds = p_playlist->pp_sds[i];
- REMOVE_ELEM( p_playlist->pp_sds, p_playlist->i_sds, i );
+ p_sds = pl_priv(p_playlist)->pp_sds[i];
+ REMOVE_ELEM( pl_priv(p_playlist)->pp_sds, pl_priv(p_playlist)->i_sds, i );
break;
}
}
return VLC_EGENERIC;
}
- services_discovery_Stop( p_sds->p_sd );
-
vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
vlc_ServicesDiscoveryItemAdded,
playlist_sd_item_added,
}
PL_UNLOCK;
- services_discovery_Destroy( p_sds->p_sd );
+ services_discovery_StopAndRelease( p_sds->p_sd );
free( p_sds );
return VLC_SUCCESS;
int i;
PL_LOCK;
- for( i = 0 ; i< p_playlist->i_sds ; i ++ )
+ for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
+ if( !strcmp( psz_module, pl_priv(p_playlist)->pp_sds[i]->p_sd->psz_module ) )
{
PL_UNLOCK;
return true;
void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
{
- while( p_playlist->i_sds > 0 )
+ while( pl_priv(p_playlist)->i_sds > 0 )
playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->pp_sds[0]->p_sd->psz_module );
+ pl_priv(p_playlist)->pp_sds[0]->p_sd->psz_module );
}
-
projects / vlc / blobdiff