X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fservices_discovery.c;h=aaa46688b63709a1d3848a2f412248f80a49858d;hb=78d87996ccb92d1dc91c9987685f976ed3be08a6;hp=03b11caef566673ee2bc2e690494f1bbe11c112c;hpb=64fb2cd16e78f0862051020f33a998626b2340bf;p=vlc diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c index 03b11caef5..aaa46688b6 100644 --- a/src/playlist/services_discovery.c +++ b/src/playlist/services_discovery.c @@ -28,12 +28,11 @@ #include #include "vlc_playlist.h" #include "vlc_events.h" +#include #include "playlist_internal.h" #include "../libvlc.h" -static void services_discovery_Destructor ( services_discovery_t * p_sd ); - /* * Services discovery * Basically you just listen to Service discovery event through the @@ -41,11 +40,10 @@ static void services_discovery_Destructor ( services_discovery_t * p_sd ); * That's how the playlist get's Service Discovery information */ -/*********************************************************************** - * GetServicesNames - ***********************************************************************/ -char ** __services_discovery_GetServicesNames( vlc_object_t * p_super, - char ***pppsz_longnames ) +/** + * Gets the list of available services discovery plugins. + */ +char **vlc_sd_GetNames( char ***pppsz_longnames ) { return module_GetModulesNamesForCapability( "services_discovery", pppsz_longnames ); @@ -54,18 +52,15 @@ char ** __services_discovery_GetServicesNames( vlc_object_t * p_super, /*********************************************************************** * Create ***********************************************************************/ -services_discovery_t * -services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name ) +services_discovery_t *vlc_sd_Create( vlc_object_t *p_super ) { 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->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_ServicesDiscoveryItemAdded ); @@ -81,26 +76,14 @@ services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name return p_sd; } -static void ObjectKillChildrens( vlc_object_t *p_obj ) -{ - vlc_list_t *p_list; - int i; - vlc_object_kill( p_obj ); - - 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 ); -} - /*********************************************************************** * Stop ***********************************************************************/ -bool services_discovery_Start ( services_discovery_t * p_sd ) +bool vlc_sd_Start ( services_discovery_t * p_sd, const char *module ) { assert(!p_sd->p_module); - p_sd->p_module = module_need( p_sd, "services_discovery", p_sd->psz_module, true ); + p_sd->p_module = module_need( p_sd, "services_discovery", module, true ); if( p_sd->p_module == NULL ) { @@ -118,32 +101,18 @@ bool services_discovery_Start ( services_discovery_t * p_sd ) /*********************************************************************** * Stop ***********************************************************************/ -void services_discovery_Stop ( services_discovery_t * p_sd ) +void vlc_sd_Stop ( services_discovery_t * p_sd ) { vlc_event_t event = { .type = vlc_ServicesDiscoveryEnded }; - ObjectKillChildrens( VLC_OBJECT(p_sd) ); - vlc_event_send( &p_sd->event_manager, &event ); module_unneed( p_sd, p_sd->p_module ); p_sd->p_module = NULL; } -/*********************************************************************** - * Destructor - ***********************************************************************/ -static void services_discovery_Destructor ( services_discovery_t * p_sd ) -{ - assert(!p_sd->p_module); /* Forgot to call Stop */ - - vlc_event_manager_fini( &p_sd->event_manager ); - free( p_sd->psz_module ); - vlc_object_release( p_sd ); -} - /*********************************************************************** * GetLocalizedName ***********************************************************************/ @@ -242,153 +211,138 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d /* First make sure that if item is a node it will be deleted. * XXX: Why don't we have a function to ensure that in the playlist code ? */ - vlc_object_lock( p_parent->p_playlist ); + playlist_Lock( p_parent->p_playlist ); p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist, - p_input->i_id, p_parent, false ); + p_input, p_parent, false ); if( p_pl_item && p_pl_item->i_children > -1 ) - { playlist_NodeDelete( p_parent->p_playlist, p_pl_item, true, false ); - vlc_object_unlock( p_parent->p_playlist ); - return; - } + else + /* Delete the non-node item normally */ + playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input, + p_parent, pl_Locked ); - /* Delete the non-node item normally */ - playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id, - p_parent, pl_Locked ); - - vlc_object_unlock( p_parent->p_playlist ); + playlist_Unlock( p_parent->p_playlist ); } -int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modules ) +int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_module ) { - const char *psz_parser = psz_modules ?: ""; - int retval = VLC_SUCCESS; + /* Perform the addition */ + msg_Dbg( p_playlist, "adding services_discovery %s...", psz_module ); - for (;;) - { - struct playlist_services_discovery_support_t * p_sds; - playlist_item_t * p_cat; - playlist_item_t * p_one; + services_discovery_t *p_sd = vlc_sd_Create( VLC_OBJECT(p_playlist) ); + if( !p_sd ) + return VLC_ENOMEM; - while( *psz_parser == ' ' || *psz_parser == ':' || *psz_parser == ',' ) - psz_parser++; + module_t *m = module_find_by_shortcut( psz_module ); + if( !m ) + { + msg_Err( p_playlist, "No such module: %s", psz_module ); + vlc_sd_Destroy( p_sd ); + return VLC_EGENERIC; + } - if( *psz_parser == '\0' ) - break; + /* Free in playlist_ServicesDiscoveryRemove */ + struct playlist_services_discovery_support_t * p_sds; + p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) ); + if( !p_sds ) + { + vlc_sd_Destroy( p_sd ); + module_release( m ); + return VLC_ENOMEM; + } - const char *psz_next = strchr( psz_parser, ':' ); - if( psz_next == NULL ) - psz_next = psz_parser + strlen( psz_parser ); + playlist_item_t * p_cat; + playlist_item_t * p_one; - char psz_plugin[psz_next - psz_parser + 1]; - memcpy (psz_plugin, psz_parser, sizeof (psz_plugin) - 1); - psz_plugin[sizeof (psz_plugin) - 1] = '\0'; - psz_parser = psz_next; + PL_LOCK; + playlist_NodesPairCreate( p_playlist, module_get_name( m, true ), + &p_cat, &p_one, false ); + PL_UNLOCK; + module_release( m ); - /* Perform the addition */ - msg_Dbg( p_playlist, "Add services_discovery %s", psz_plugin ); - services_discovery_t *p_sd; + vlc_event_attach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemAdded, + playlist_sd_item_added, p_one ); + + vlc_event_attach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemAdded, + playlist_sd_item_added, p_cat ); - p_sd = services_discovery_Create( (vlc_object_t*)p_playlist, psz_plugin ); - if( !p_sd ) - continue; + vlc_event_attach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemRemoved, + playlist_sd_item_removed, p_one ); - vlc_event_attach( services_discovery_EventManager( p_sd ), - vlc_ServicesDiscoveryItemAdded, - playlist_sd_item_added, - p_one ); - - vlc_event_attach( services_discovery_EventManager( p_sd ), - vlc_ServicesDiscoveryItemAdded, - playlist_sd_item_added, - p_cat ); - - vlc_event_attach( services_discovery_EventManager( p_sd ), - vlc_ServicesDiscoveryItemRemoved, - playlist_sd_item_removed, - p_one ); - - vlc_event_attach( services_discovery_EventManager( p_sd ), - vlc_ServicesDiscoveryItemRemoved, - playlist_sd_item_removed, - p_cat ); - - bool ret = services_discovery_Start( p_sd ); - if(!ret) - { - vlc_object_release( p_sd ); - return VLC_EGENERIC; - } - - char *psz = services_discovery_GetLocalizedName( p_sd ); - assert( psz ); - PL_LOCK; - playlist_NodesPairCreate( p_playlist, psz, - &p_cat, &p_one, false ); - PL_UNLOCK; - free( psz ); - - /* Free in playlist_ServicesDiscoveryRemove */ - p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) ); - if( !p_sds ) - return VLC_ENOMEM; - - /* We want tree-view for service directory */ - p_one->p_input->b_prefers_tree = true; - p_sds->p_sd = p_sd; - p_sds->p_one = p_one; - p_sds->p_cat = p_cat; - - PL_LOCK; - TAB_APPEND( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds, p_sds ); - PL_UNLOCK; + vlc_event_attach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemRemoved, + playlist_sd_item_removed, p_cat ); + if( !vlc_sd_Start( p_sd, psz_module ) ) + { + vlc_sd_Destroy( p_sd ); + free( p_sds ); + return VLC_EGENERIC; } - return retval; + /* We want tree-view for service directory */ + p_one->p_input->b_prefers_tree = true; + p_sds->p_sd = p_sd; + p_sds->p_one = p_one; + p_sds->p_cat = p_cat; + p_sds->psz_name = strdup( psz_module ); + + PL_LOCK; + TAB_APPEND( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds, p_sds ); + PL_UNLOCK; + + return VLC_SUCCESS; } int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist, - const char *psz_module ) + const char *psz_name ) { + playlist_private_t *priv = pl_priv( p_playlist ); struct playlist_services_discovery_support_t * p_sds = NULL; - int i; PL_LOCK; - for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ ) + for( int i = 0; i < priv->i_sds; i++ ) { - if( !strcmp( psz_module, pl_priv(p_playlist)->pp_sds[i]->p_sd->psz_module ) ) + if( !strcmp( psz_name, priv->pp_sds[i]->psz_name ) ) { - p_sds = pl_priv(p_playlist)->pp_sds[i]; - REMOVE_ELEM( pl_priv(p_playlist)->pp_sds, pl_priv(p_playlist)->i_sds, i ); + p_sds = priv->pp_sds[i]; + REMOVE_ELEM( priv->pp_sds, priv->i_sds, i ); break; } } PL_UNLOCK; - if( !p_sds || !p_sds->p_sd ) + if( !p_sds ) { - msg_Warn( p_playlist, "module %s is not loaded", psz_module ); + msg_Warn( p_playlist, "discovery %s is not loaded", psz_name ); return VLC_EGENERIC; } - vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ), + services_discovery_t *p_sd = p_sds->p_sd; + assert( p_sd ); + + vlc_sd_Stop( p_sd ); + + vlc_event_detach( services_discovery_EventManager( p_sd ), vlc_ServicesDiscoveryItemAdded, playlist_sd_item_added, p_sds->p_one ); - vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ), + vlc_event_detach( services_discovery_EventManager( p_sd ), vlc_ServicesDiscoveryItemAdded, playlist_sd_item_added, p_sds->p_cat ); - vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ), + vlc_event_detach( services_discovery_EventManager( p_sd ), vlc_ServicesDiscoveryItemRemoved, playlist_sd_item_removed, p_sds->p_one ); - vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ), + vlc_event_detach( services_discovery_EventManager( p_sd ), vlc_ServicesDiscoveryItemRemoved, playlist_sd_item_removed, p_sds->p_cat ); @@ -403,33 +357,39 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist, } PL_UNLOCK; - services_discovery_StopAndRelease( p_sds->p_sd ); + vlc_sd_Destroy( p_sd ); + free( p_sds->psz_name ); free( p_sds ); return VLC_SUCCESS; } bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist, - const char *psz_module ) + const char *psz_name ) { - int i; + playlist_private_t *priv = pl_priv( p_playlist ); + bool found = false; PL_LOCK; - for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ ) + for( int i = 0; i < priv->i_sds; i++ ) { - if( !strcmp( psz_module, pl_priv(p_playlist)->pp_sds[i]->p_sd->psz_module ) ) + vlc_sd_internal_t *sd = priv->pp_sds[i]; + + if( sd->psz_name && !strcmp( psz_name, sd->psz_name ) ) { - PL_UNLOCK; - return true; + found = true; + break; } } PL_UNLOCK; - return false; + return found; } void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ) { - while( pl_priv(p_playlist)->i_sds > 0 ) + playlist_private_t *priv = pl_priv( p_playlist ); + + while( priv->i_sds > 0 ) playlist_ServicesDiscoveryRemove( p_playlist, - pl_priv(p_playlist)->pp_sds[0]->p_sd->psz_module ); + priv->pp_sds[0]->psz_name ); }