struct vlc_sd_internal_t
{
/* the playlist items for category and onelevel */
- playlist_item_t *p_cat;
- playlist_item_t *p_one;
+ playlist_item_t *p_node;
services_discovery_t *p_sd; /**< Loaded service discovery modules */
char *psz_name;
};
/***********************************************************************
* Create
***********************************************************************/
-services_discovery_t *vlc_sd_Create( vlc_object_t *p_super )
+services_discovery_t *vlc_sd_Create( vlc_object_t *p_super,
+ const char *cfg )
{
services_discovery_t *p_sd;
"services discovery" );
if( !p_sd )
return NULL;
+ free(config_ChainCreate( &p_sd->psz_name, &p_sd->p_cfg, cfg ));
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,
/***********************************************************************
* Stop
***********************************************************************/
-bool vlc_sd_Start ( services_discovery_t * p_sd, const char *module )
+bool vlc_sd_Start ( services_discovery_t * p_sd )
{
assert(!p_sd->p_module);
- p_sd->p_module = module_need( p_sd, "services_discovery", module, true );
-
+ p_sd->p_module = module_need( p_sd, "services_discovery",
+ p_sd->psz_name, true );
if( p_sd->p_module == NULL )
{
msg_Err( p_sd, "no suitable services discovery module" );
return false;
}
-
+
vlc_event_t event = {
.type = vlc_ServicesDiscoveryStarted
};
vlc_event_send( &p_sd->event_manager, &event );
return true;
}
-
+
/***********************************************************************
* Stop
***********************************************************************/
vlc_event_t event = {
.type = vlc_ServicesDiscoveryEnded
};
-
+
vlc_event_send( &p_sd->event_manager, &event );
module_unneed( p_sd, p_sd->p_module );
p_sd->p_module = NULL;
}
+void vlc_sd_Destroy( services_discovery_t *p_sd )
+{
+ config_ChainDestroy( p_sd->p_cfg );
+ free( p_sd->psz_name );
+ vlc_object_release( p_sd );
+}
+
/***********************************************************************
* Destructor
***********************************************************************/
{
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_playlist, "Adding %s in %s",
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_playlist->p_root_category )
+ if( !EMPTY_STR(psz_cat) )
{
/* */
playlist_item_t * p_cat;
p_parent = p_cat;
}
- p_new_item = playlist_NodeAddInput( p_playlist, p_input, p_parent,
- PLAYLIST_APPEND, PLAYLIST_END, pl_Locked );
- if( p_new_item )
- {
- 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;
}
{
input_item_t * p_input = p_event->u.services_discovery_item_removed.p_item;
playlist_item_t * p_parent = user_data;
- playlist_item_t * p_pl_item;
-
- /* 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 ? */
- playlist_Lock( p_parent->p_playlist );
- p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist,
- 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 );
- else
- /* Delete the non-node item normally */
- playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input,
- p_parent, pl_Locked );
-
- playlist_Unlock( p_parent->p_playlist );
+ playlist_DeleteFromInput( p_parent->p_playlist, p_input, false );
}
-int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_module )
+int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
+ const char *psz_name )
{
/* Perform the addition */
- msg_Dbg( p_playlist, "adding services_discovery %s...", psz_module );
+ services_discovery_t *p_sd;
- services_discovery_t *p_sd = vlc_sd_Create( VLC_OBJECT(p_playlist) );
+ msg_Dbg( p_playlist, "adding services_discovery %s...", psz_name );
+ p_sd = vlc_sd_Create( VLC_OBJECT(p_playlist), psz_name );
if( !p_sd )
return VLC_ENOMEM;
- module_t *m = module_find_by_shortcut( psz_module );
+ module_t *m = module_find_by_shortcut( p_sd->psz_name );
if( !m )
{
- msg_Err( p_playlist, "No such module: %s", psz_module );
+ msg_Err( p_playlist, "No such module: %s", p_sd->psz_name );
vlc_sd_Destroy( p_sd );
return VLC_EGENERIC;
}
return VLC_ENOMEM;
}
- playlist_item_t * p_cat;
- playlist_item_t * p_one;
+ playlist_item_t *p_node;
+
+ /* Look for configuration chain "longname" */
+ const char *psz_longname = NULL;
+ if( p_sd->p_cfg )
+ {
+ config_chain_t *cfg = p_sd->p_cfg;
+ while( cfg )
+ {
+ if( cfg->psz_name && !strcmp( cfg->psz_name, "longname" ) )
+ {
+ psz_longname = cfg->psz_value;
+ break;
+ }
+ cfg = cfg->p_next;
+ }
+ }
+
+ /* Fallback on module's long name if not found */
+ if( !psz_longname )
+ {
+ psz_longname = module_get_name( m, true );
+ }
PL_LOCK;
- playlist_NodesPairCreate( p_playlist, module_get_name( m, true ),
- &p_cat, &p_one, false );
+ p_node = playlist_NodeCreate( p_playlist, psz_longname,
+ p_playlist->p_root, 0, NULL );
PL_UNLOCK;
module_release( m );
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 );
+ playlist_sd_item_added, p_node );
vlc_event_attach( services_discovery_EventManager( p_sd ),
vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed, p_one );
+ playlist_sd_item_removed, p_node );
- vlc_event_attach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed, p_cat );
-
- if( !vlc_sd_Start( p_sd, psz_module ) )
+ if( !vlc_sd_Start( p_sd ) )
{
vlc_sd_Destroy( p_sd );
free( p_sds );
}
/* We want tree-view for service directory */
- p_one->p_input->b_prefers_tree = true;
+ p_node->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 );
+ p_sds->p_node = p_node;
+ p_sds->psz_name = strdup( psz_name );
PL_LOCK;
TAB_APPEND( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds, p_sds );
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_sd ),
- vlc_ServicesDiscoveryItemAdded,
- playlist_sd_item_added,
- p_sds->p_cat );
-
- vlc_event_detach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed,
- p_sds->p_one );
+ p_sds->p_node );
vlc_event_detach( services_discovery_EventManager( p_sd ),
vlc_ServicesDiscoveryItemRemoved,
playlist_sd_item_removed,
- p_sds->p_cat );
+ p_sds->p_node );
/* Remove the sd playlist node if it exists */
PL_LOCK;
- if( p_sds->p_cat != p_playlist->p_root_category &&
- p_sds->p_one != p_playlist->p_root_onelevel )
- {
- playlist_NodeDelete( p_playlist, p_sds->p_cat, true, false );
- playlist_NodeDelete( p_playlist, p_sds->p_one, true, false );
- }
+ playlist_NodeDelete( p_playlist, p_sds->p_node, true, false );
PL_UNLOCK;
vlc_sd_Destroy( p_sd );
projects / vlc / blobdiff