X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fservices_discovery.c;h=cdbbeb22cbad1c0b233361c5327cd86ed4db5f95;hb=5aa95193923fee9ff548e8504ae51e1767230906;hp=f3691da6cb6139741ee1ba483f75b1b723a2b0fe;hpb=f60a8c729f19447d9982c769a3cc95eef383d9c3;p=vlc diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c index f3691da6cb..cdbbeb22cb 100644 --- a/src/playlist/services_discovery.c +++ b/src/playlist/services_discovery.c @@ -28,10 +28,10 @@ #include #include "vlc_playlist.h" #include "vlc_events.h" +#include #include "playlist_internal.h" #include "../libvlc.h" -static void RunSD( services_discovery_t *p_sd ); /* * Services discovery @@ -40,31 +40,27 @@ static void RunSD( 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( p_super, "services_discovery", + return module_GetModulesNamesForCapability( "services_discovery", pppsz_longnames ); } /*********************************************************************** * 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; + 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; - 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 ); @@ -75,60 +71,46 @@ services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name 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 + * Stop ***********************************************************************/ -void services_discovery_Destroy ( services_discovery_t * p_sd ) +bool vlc_sd_Start ( services_discovery_t * p_sd, const char *module ) { - vlc_event_manager_fini( &p_sd->event_manager ); + assert(!p_sd->p_module); - free( p_sd->psz_module ); - free( p_sd->psz_localized_name ); + p_sd->p_module = module_need( p_sd, "services_discovery", module, true ); - vlc_object_detach( p_sd ); - vlc_object_release( p_sd ); -} - -/*********************************************************************** - * Start - ***********************************************************************/ -int 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)) + 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 ***********************************************************************/ -void services_discovery_Stop ( services_discovery_t * p_sd ) +void vlc_sd_Stop ( services_discovery_t * p_sd ) { - vlc_object_kill( p_sd ); - if( p_sd->pf_run ) vlc_thread_join( p_sd ); + vlc_event_t event = { + .type = vlc_ServicesDiscoveryEnded + }; + + vlc_event_send( &p_sd->event_manager, &event ); - module_Unneed( p_sd, p_sd->p_module ); + module_unneed( p_sd, p_sd->p_module ); + p_sd->p_module = NULL; } /*********************************************************************** @@ -137,17 +119,7 @@ void services_discovery_Stop ( services_discovery_t * p_sd ) char * services_discovery_GetLocalizedName ( services_discovery_t * p_sd ) { - return p_sd->psz_localized_name ? strdup( p_sd->psz_localized_name ) : NULL; -} - -/*********************************************************************** - * SetLocalizedName - ***********************************************************************/ -void -services_discovery_SetLocalizedName ( services_discovery_t * p_sd, const char *psz ) -{ - free( p_sd->psz_localized_name ); - p_sd->psz_localized_name = strdup(psz); + return strdup( module_get_name( p_sd->p_module, true ) ); } /*********************************************************************** @@ -187,23 +159,6 @@ services_discovery_RemoveItem ( services_discovery_t * p_sd, input_item_t * p_it vlc_event_send( &p_sd->event_manager, &event ); } -/*********************************************************************** - * RunSD (Private) - ***********************************************************************/ -static void RunSD( services_discovery_t *p_sd ) -{ - vlc_event_t event; - - event.type = vlc_ServicesDiscoveryStarted; - vlc_event_send( &p_sd->event_manager, &event ); - - p_sd->pf_run( p_sd ); - - event.type = vlc_ServicesDiscoveryEnded; - vlc_event_send( &p_sd->event_manager, &event ); - return; -} - /* * Playlist - Services discovery bridge */ @@ -266,135 +221,131 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d vlc_object_unlock( p_parent->p_playlist ); return; } - vlc_object_unlock( p_parent->p_playlist ); /* Delete the non-node item normally */ - playlist_DeleteInputInParent( p_parent->p_playlist, p_input->i_id, - p_parent, false ); + playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id, + p_parent, pl_Locked ); + + vlc_object_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 ); + + services_discovery_t *p_sd = vlc_sd_Create( VLC_OBJECT(p_playlist) ); + if( !p_sd ) + return VLC_ENOMEM; - for (;;) + module_t *m = module_find( psz_module ); + if( !m ) { - struct playlist_services_discovery_support_t * p_sds; - playlist_item_t * p_cat; - playlist_item_t * p_one; + msg_Err( p_playlist, "No such module: %s", psz_module ); + vlc_sd_Destroy( p_sd ); + return VLC_EGENERIC; + } - while( *psz_parser == ' ' || *psz_parser == ':' || *psz_parser == ',' ) - psz_parser++; + /* 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; + } - if( *psz_parser == '\0' ) - break; + playlist_item_t * p_cat; + playlist_item_t * p_one; + + PL_LOCK; + playlist_NodesPairCreate( p_playlist, module_get_name( m, true ), + &p_cat, &p_one, false ); + PL_UNLOCK; + module_release( m ); - const char *psz_next = strchr( psz_parser, ':' ); - if( psz_next == NULL ) - psz_next = psz_parser + strlen( psz_parser ); - - 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; - - /* Perform the addition */ - msg_Dbg( p_playlist, "Add services_discovery %s", psz_plugin ); - services_discovery_t *p_sd; - - p_sd = services_discovery_Create( (vlc_object_t*)p_playlist, psz_plugin ); - if( !p_sd ) - continue; - - 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 ); - - 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 ); - - services_discovery_Start( p_sd ); - - /* Free in playlist_ServicesDiscoveryRemove */ - p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) ); - if( !p_sds ) - return VLC_ENOMEM; - p_sds->p_sd = p_sd; - p_sds->p_one = p_one; - p_sds->p_cat = p_cat; - - PL_LOCK; - TAB_APPEND( p_playlist->i_sds, p_playlist->pp_sds, p_sds ); - PL_UNLOCK; + 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 ); + + 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; + + 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_module ) { struct playlist_services_discovery_support_t * p_sds = NULL; 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, module_get_object( pl_priv(p_playlist)->pp_sds[i]->p_sd->p_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; } } PL_UNLOCK; - if( !p_sds || !p_sds->p_sd ) + if( !p_sds ) { msg_Warn( p_playlist, "module %s is not loaded", psz_module ); return VLC_EGENERIC; } - services_discovery_Stop( p_sds->p_sd ); + services_discovery_t *p_sd = p_sds->p_sd; + assert( p_sd ); - vlc_event_detach( services_discovery_EventManager( p_sds->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 ); @@ -409,7 +360,8 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist, } PL_UNLOCK; - services_discovery_Destroy( p_sds->p_sd ); + vlc_sd_Destroy( p_sd ); + free( p_sds ); return VLC_SUCCESS; } @@ -420,9 +372,9 @@ bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist, 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, module_get_object( pl_priv(p_playlist)->pp_sds[i]->p_sd->p_module ) ) ) { PL_UNLOCK; return true; @@ -434,8 +386,7 @@ bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist, 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 ); + module_get_object( pl_priv(p_playlist)->pp_sds[0]->p_sd->p_module ) ); } -