X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fservices_discovery.c;h=9d53971d607109714a7395cd43b973acfee08737;hb=5ec48fbcda446d0fd4050f5db6f3a52cf772c2a2;hp=931feaa297b4aa5e8a22c7c5282dd8481e2a8244;hpb=02e8a6cff9912da14baec5ed3cd09e07270ad2cf;p=vlc diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c index 931feaa297..9d53971d60 100644 --- a/src/playlist/services_discovery.c +++ b/src/playlist/services_discovery.c @@ -20,12 +20,82 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include + +#include #include "vlc_playlist.h" #include "vlc_events.h" +#include +#include #include "playlist_internal.h" +#include "../libvlc.h" + +typedef struct +{ + char *name; + char *longname; +} vlc_sd_probe_t; + +int vlc_sd_probe_Add (vlc_probe_t *probe, const char *name, + const char *longname) +{ + vlc_sd_probe_t names = { strdup(name), strdup(longname) }; + + if (unlikely (names.name == NULL || names.longname == NULL + || vlc_probe_add (probe, &names, sizeof (names)))) + { + free (names.name); + free (names.longname); + return VLC_ENOMEM; + } + return VLC_PROBE_CONTINUE; +} + +#undef vlc_sd_GetNames + +/** + * Gets the list of available services discovery plugins. + */ +char **vlc_sd_GetNames (vlc_object_t *obj, char ***pppsz_longnames) +{ + size_t count; + vlc_sd_probe_t *tab = vlc_probe (obj, "services probe", &count); + + if (count == 0) + { + free (tab); + return NULL; + } + + char **names = malloc (sizeof(char *) * (count + 1)); + char **longnames = malloc (sizeof(char *) * (count + 1)); + + if (unlikely (names == NULL || longnames == NULL)) + abort(); + for( size_t i = 0; i < count; i++ ) + { + names[i] = tab[i].name; + longnames[i] = tab[i].longname; + } + free (tab); + names[count] = longnames[count] = NULL; + *pppsz_longnames = longnames; + return names; +} + + +struct vlc_sd_internal_t +{ + /* the playlist items for category and onelevel */ + playlist_item_t *p_node; + services_discovery_t *p_sd; /**< Loaded service discovery modules */ + char *psz_name; +}; -static void RunSD( services_discovery_t *p_sd ); +static void services_discovery_Destructor ( vlc_object_t *p_obj ); /* * Services discovery @@ -37,93 +107,85 @@ static void RunSD( services_discovery_t *p_sd ); /*********************************************************************** * 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 = vlc_object_create( p_super, VLC_OBJECT_SD ); + 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_event_manager_register_event_type( &p_sd->event_manager, vlc_ServicesDiscoveryItemAdded ); - vlc_event_manager_register_event_type( &p_sd->event_manager, + vlc_event_manager_register_event_type( &p_sd->event_manager, vlc_ServicesDiscoveryItemRemoved ); + vlc_event_manager_register_event_type( &p_sd->event_manager, + vlc_ServicesDiscoveryStarted ); + 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, 0 ); - - if( p_sd->p_module == NULL ) - { - msg_Err( p_super, "no suitable services discovery module" ); - vlc_object_destroy( p_sd ); - return NULL; - } - p_sd->psz_module = strdup( psz_module_name ); - p_sd->b_die = VLC_FALSE; /* FIXME */ + vlc_object_set_destructor( p_sd, services_discovery_Destructor ); + 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 ); - - free( p_sd->psz_module ); - free( p_sd->psz_localized_name ); + assert(!p_sd->p_module); - vlc_object_destroy( p_sd ); -} + p_sd->p_module = module_need( p_sd, "services_discovery", module, true ); -/*********************************************************************** - * 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, VLC_FALSE)) + if( p_sd->p_module == NULL ) { - msg_Err( p_sd, "cannot create services discovery thread" ); - vlc_object_destroy( 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; } /*********************************************************************** - * GetLocalizedName + * Destructor ***********************************************************************/ -char * -services_discovery_GetLocalizedName ( services_discovery_t * p_sd ) +static void services_discovery_Destructor ( vlc_object_t *p_obj ) { - return p_sd->psz_localized_name ? strdup( p_sd->psz_localized_name ) : NULL; + services_discovery_t * p_sd = (services_discovery_t *)p_obj; + assert(!p_sd->p_module); /* Forgot to call Stop */ + vlc_event_manager_fini( &p_sd->event_manager ); } /*********************************************************************** - * SetLocalizedName + * GetLocalizedName ***********************************************************************/ -void -services_discovery_SetLocalizedName ( services_discovery_t * p_sd, const char *psz ) +char * +services_discovery_GetLocalizedName ( services_discovery_t * p_sd ) { - if(p_sd->psz_localized_name) free( p_sd->psz_localized_name ); - p_sd->psz_localized_name = strdup(psz); + return strdup( module_get_name( p_sd->p_module, true ) ); } /*********************************************************************** @@ -163,15 +225,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 ) -{ - p_sd->pf_run( p_sd ); - return; -} - /* * Playlist - Services discovery bridge */ @@ -181,30 +234,33 @@ static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_dat { input_item_t * p_input = p_event->u.services_discovery_item_added.p_new_item; const char * psz_cat = p_event->u.services_discovery_item_added.psz_category; - playlist_item_t *p_new_item, * p_parent = user_data; + playlist_item_t * p_parent = user_data; + playlist_t * p_playlist = p_parent->p_playlist; - msg_Dbg( p_parent->p_playlist, "Adding %s in %s", p_input->psz_name, psz_cat ); + msg_Dbg( p_playlist, "Adding %s in %s", + p_input->psz_name ? p_input->psz_name : "(null)", + psz_cat ? psz_cat : "(null)" ); + PL_LOCK; /* If p_parent is in root category (this is clearly a hack) and we have a cat */ - if( !EMPTY_STR(psz_cat) && - p_parent->p_parent == p_parent->p_playlist->p_root_category ) + if( !EMPTY_STR(psz_cat) ) { /* */ playlist_item_t * p_cat; p_cat = playlist_ChildSearchName( p_parent, psz_cat ); if( !p_cat ) { - p_cat = playlist_NodeCreate( p_parent->p_playlist, psz_cat, - p_parent, 0 ); + p_cat = playlist_NodeCreate( p_playlist, psz_cat, + p_parent, 0, NULL ); p_cat->i_flags &= ~PLAYLIST_SKIP_FLAG; } p_parent = p_cat; } - - p_new_item = playlist_NodeAddInput( p_parent->p_playlist, p_input, p_parent, - PLAYLIST_APPEND, PLAYLIST_END, VLC_FALSE ); - p_new_item->i_flags &= ~PLAYLIST_SKIP_FLAG; - p_new_item->i_flags &= ~PLAYLIST_SAVE_FLAG; + + playlist_NodeAddInput( p_playlist, p_input, p_parent, + PLAYLIST_APPEND, PLAYLIST_END, + pl_Locked ); + PL_UNLOCK; } /* A new item has been removed from a certain sd */ @@ -212,176 +268,151 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d { input_item_t * p_input = p_event->u.services_discovery_item_removed.p_item; playlist_item_t * p_parent = user_data; - - playlist_DeleteInputInParent( p_parent->p_playlist, p_input->i_id, - p_parent, VLC_FALSE ); + playlist_DeleteFromInput( p_parent->p_playlist, p_input, false ); } -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_archived_services_discovery_t * p_asd; - 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++; + char *psz_name = NULL; + config_ChainCreate( &psz_name, &p_sd->p_cfg, psz_module ); - if( *psz_parser == '\0' ) - break; + module_t *m = module_find_by_shortcut( psz_name ); + if( !m ) + { + msg_Err( p_playlist, "No such module: %s", psz_name ); + vlc_sd_Destroy( p_sd ); + return VLC_EGENERIC; + } - const char *psz_next = strchr( psz_parser, ':' ); - if( psz_next == NULL ) - psz_next = psz_parser + strlen( psz_parser ); + /* Free in playlist_ServicesDiscoveryRemove */ + vlc_sd_internal_t * p_sds = malloc( sizeof(*p_sds) ); + if( !p_sds ) + { + vlc_sd_Destroy( p_sd ); + module_release( m ); + return VLC_ENOMEM; + } - 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; + playlist_item_t *p_node; - /* Perform the addition */ - msg_Dbg( p_playlist, "Add services_discovery %s", psz_plugin ); - services_discovery_t *p_sd; + PL_LOCK; + p_node = playlist_NodeCreate( p_playlist, module_get_name( m, true ), + p_playlist->p_root, 0, NULL ); + PL_UNLOCK; + module_release( m ); - 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_ServicesDiscoveryItemAdded, + playlist_sd_item_added, p_node ); - char * psz = services_discovery_GetLocalizedName( p_sd ); - if( psz ) - { - playlist_NodesPairCreate( p_playlist, psz, - &p_cat, &p_one, VLC_FALSE ); - free( psz ); - } - else - { - /* No name, just add at the top of the playlist */ - PL_LOCK; - p_cat = p_playlist->p_root_category; - p_one = p_playlist->p_root_onelevel; - PL_UNLOCK; - } + vlc_event_attach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemRemoved, + playlist_sd_item_removed, p_node ); - 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_asd = malloc( sizeof(struct playlist_archived_services_discovery_t) ); - p_asd->p_sd = p_sd; - p_asd->p_one = p_one; - p_asd->p_cat = p_cat; - - PL_LOCK; - TAB_APPEND( p_playlist->p_internal->i_asds, p_playlist->p_internal->pp_asds, p_asd ); - PL_UNLOCK; + if( !vlc_sd_Start( p_sd, psz_name ) ) + { + vlc_sd_Destroy( p_sd ); + free( p_sds ); + return VLC_EGENERIC; } - return retval; + /* We want tree-view for service directory */ + p_node->p_input->b_prefers_tree = true; + p_sds->p_sd = p_sd; + p_sds->p_node = p_node; + 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 ) { - int i; - struct playlist_archived_services_discovery_t *p_asd = NULL; + playlist_private_t *priv = pl_priv( p_playlist ); + vlc_sd_internal_t * p_sds = NULL; PL_LOCK; - for( i = 0 ; i< p_playlist->p_internal->i_asds ; i ++ ) + for( int i = 0; i < priv->i_sds; i++ ) { - if( !strcmp( psz_module, p_playlist->p_internal->pp_asds[i]->p_sd->psz_module ) ) + if( !strcmp( psz_name, priv->pp_sds[i]->psz_name ) ) { - p_asd = p_playlist->p_internal->pp_asds[i]; - REMOVE_ELEM( p_playlist->p_internal->pp_asds, p_playlist->p_internal->i_asds, i ); + p_sds = priv->pp_sds[i]; + REMOVE_ELEM( priv->pp_sds, priv->i_sds, i ); break; } } PL_UNLOCK; - if( p_asd && p_asd->p_sd ) + if( !p_sds ) { - services_discovery_Stop( p_asd->p_sd ); + msg_Warn( p_playlist, "discovery %s is not loaded", psz_name ); + return VLC_EGENERIC; + } - vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ), - vlc_ServicesDiscoveryItemAdded, - playlist_sd_item_added, - p_asd->p_one ); - - vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ), - vlc_ServicesDiscoveryItemAdded, - playlist_sd_item_added, - p_asd->p_cat ); - - vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ), - vlc_ServicesDiscoveryItemRemoved, - playlist_sd_item_removed, - p_asd->p_one ); - - vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ), - vlc_ServicesDiscoveryItemRemoved, - playlist_sd_item_removed, - p_asd->p_cat ); - - /* Remove the sd playlist node if it exists */ - PL_LOCK; - if( p_asd->p_cat != p_playlist->p_root_category && - p_asd->p_one != p_playlist->p_root_onelevel ) - { - playlist_NodeDelete( p_playlist, p_asd->p_cat, VLC_TRUE, VLC_FALSE ); - playlist_NodeDelete( p_playlist, p_asd->p_one, VLC_TRUE, VLC_FALSE ); - } - PL_UNLOCK; + services_discovery_t *p_sd = p_sds->p_sd; + assert( p_sd ); - services_discovery_Destroy( p_asd->p_sd ); + vlc_sd_Stop( p_sd ); + + vlc_event_detach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemAdded, + playlist_sd_item_added, + p_sds->p_node ); + + vlc_event_detach( services_discovery_EventManager( p_sd ), + vlc_ServicesDiscoveryItemRemoved, + playlist_sd_item_removed, + p_sds->p_node ); + + /* Remove the sd playlist node if it exists */ + PL_LOCK; + playlist_NodeDelete( p_playlist, p_sds->p_node, true, false ); + PL_UNLOCK; + + vlc_sd_Destroy( p_sd ); + free( p_sds->psz_name ); + free( p_sds ); - free( p_asd ); - } - else - { - msg_Warn( p_playlist, "module %s is not loaded", psz_module ); - return VLC_EGENERIC; - } return VLC_SUCCESS; } -vlc_bool_t playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist, - const char *psz_module ) +bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist, + const char *psz_name ) { - int i; + playlist_private_t *priv = pl_priv( p_playlist ); + bool found = false; PL_LOCK; - for( i = 0 ; i< p_playlist->p_internal->i_asds ; i ++ ) + for( int i = 0; i < priv->i_sds; i++ ) { - if( !strcmp( psz_module, p_playlist->p_internal->pp_asds[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 VLC_TRUE; + found = true; + break; } } PL_UNLOCK; - return VLC_FALSE; + return found; } +void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ) +{ + playlist_private_t *priv = pl_priv( p_playlist ); + + while( priv->i_sds > 0 ) + playlist_ServicesDiscoveryRemove( p_playlist, + priv->pp_sds[0]->psz_name ); +}