* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
#include "vlc_playlist.h"
+#include "vlc_events.h"
#include "playlist_internal.h"
+#include "../libvlc.h"
static void RunSD( services_discovery_t *p_sd );
+/*
+ * Services discovery
+ * Basically you just listen to Service discovery event through the
+ * sd's event manager.
+ * That's how the playlist get's Service Discovery information
+ */
+
+/***********************************************************************
+ * GetServicesNames
+ ***********************************************************************/
+char ** __services_discovery_GetServicesNames( vlc_object_t * p_super,
+ char ***pppsz_longnames )
+{
+ return module_GetModulesNamesForCapability( p_super, "services_discovery",
+ pppsz_longnames );
+}
+
+/***********************************************************************
+ * Create
+ ***********************************************************************/
+services_discovery_t *
+services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name )
+{
+ 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 );
+ 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, 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 )
+{
+ vlc_event_manager_fini( &p_sd->event_manager );
+
+ free( p_sd->psz_module );
+ free( p_sd->psz_localized_name );
+
+ 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))
+ {
+ msg_Err( p_sd, "cannot create services discovery thread" );
+ vlc_object_release( p_sd );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
+/***********************************************************************
+ * Stop
+ ***********************************************************************/
+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 );
+}
+
+void services_discovery_Stop ( services_discovery_t * p_sd )
+{
+ ObjectKillChildrens( VLC_OBJECT(p_sd) );
+ if( p_sd->pf_run ) vlc_thread_join( p_sd );
+
+ module_Unneed( p_sd, p_sd->p_module );
+}
+
+/***********************************************************************
+ * GetLocalizedName
+ ***********************************************************************/
+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);
+}
+
+/***********************************************************************
+ * EventManager
+ ***********************************************************************/
+vlc_event_manager_t *
+services_discovery_EventManager ( services_discovery_t * p_sd )
+{
+ return &p_sd->event_manager;
+}
+
+/***********************************************************************
+ * AddItem
+ ***********************************************************************/
+void
+services_discovery_AddItem ( services_discovery_t * p_sd, input_item_t * p_item,
+ const char * psz_category )
+{
+ vlc_event_t event;
+ event.type = vlc_ServicesDiscoveryItemAdded;
+ event.u.services_discovery_item_added.p_new_item = p_item;
+ event.u.services_discovery_item_added.psz_category = psz_category;
+
+ vlc_event_send( &p_sd->event_manager, &event );
+}
+
+/***********************************************************************
+ * RemoveItem
+ ***********************************************************************/
+void
+services_discovery_RemoveItem ( services_discovery_t * p_sd, input_item_t * p_item )
+{
+ vlc_event_t event;
+ event.type = vlc_ServicesDiscoveryItemRemoved;
+ event.u.services_discovery_item_removed.p_item = p_item;
+
+ 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
+ */
+
+ /* A new item has been added to a certain sd */
+static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_data )
+{
+ 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_t * p_playlist = p_parent->p_playlist;
+
+ 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_playlist->p_root_category )
+ {
+ /* */
+ playlist_item_t * p_cat;
+ p_cat = playlist_ChildSearchName( p_parent, psz_cat );
+ if( !p_cat )
+ {
+ 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_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;
+ }
+ PL_UNLOCK;
+}
+
+ /* A new item has been removed from a certain sd */
+static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_data )
+{
+ 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 ? */
+ vlc_object_lock( p_parent->p_playlist );
+ p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist,
+ p_input->i_id, 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;
+ }
+
+ /* 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 );
+}
+
int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modules )
{
const char *psz_parser = psz_modules ?: "";
for (;;)
{
+ struct playlist_services_discovery_support_t * p_sds;
+ playlist_item_t * p_cat;
+ playlist_item_t * p_one;
+
while( *psz_parser == ' ' || *psz_parser == ':' || *psz_parser == ',' )
psz_parser++;
/* Perform the addition */
msg_Dbg( p_playlist, "Add services_discovery %s", psz_plugin );
- services_discovery_t *p_sd = vlc_object_create( p_playlist,
- VLC_OBJECT_SD );
- if( p_sd == NULL )
- return VLC_ENOMEM;
-
- p_sd->pf_run = NULL;
- p_sd->p_module = module_Need( p_sd, "services_discovery", psz_plugin, 0 );
+ services_discovery_t *p_sd;
- if( p_sd->p_module == NULL )
- {
- msg_Err( p_playlist, "no suitable services discovery module" );
- vlc_object_destroy( p_sd );
- retval = VLC_EGENERIC;
+ p_sd = services_discovery_Create( (vlc_object_t*)p_playlist, psz_plugin );
+ if( !p_sd )
continue;
- }
- p_sd->psz_module = strdup( psz_plugin );
- p_sd->b_die = VLC_FALSE; /* FIXME */
+ char * psz = services_discovery_GetLocalizedName( p_sd );
+ assert( psz );
PL_LOCK;
- TAB_APPEND( p_playlist->i_sds, p_playlist->pp_sds, p_sd );
+ playlist_NodesPairCreate( p_playlist, psz,
+ &p_cat, &p_one, false );
PL_UNLOCK;
+ free( psz );
- if ((p_sd->pf_run != NULL)
- && vlc_thread_create( p_sd, "services_discovery", RunSD,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE))
- {
- msg_Err( p_sd, "cannot create services discovery thread" );
- vlc_object_destroy( p_sd );
- retval = VLC_EGENERIC;
- continue;
- }
+ 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;
}
return retval;
int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
const char *psz_module )
{
+ struct playlist_services_discovery_support_t * p_sds = NULL;
int i;
- services_discovery_t *p_sd = NULL;
PL_LOCK;
for( i = 0 ; i< p_playlist->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->pp_sds[i]->psz_module ) )
+ if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
{
- p_sd = p_playlist->pp_sds[i];
+ p_sds = p_playlist->pp_sds[i];
REMOVE_ELEM( p_playlist->pp_sds, p_playlist->i_sds, i );
break;
}
}
PL_UNLOCK;
- if( p_sd )
- {
- vlc_object_kill( p_sd );
- if( p_sd->pf_run ) vlc_thread_join( p_sd );
-
- free( p_sd->psz_module );
- module_Unneed( p_sd, p_sd->p_module );
- vlc_object_destroy( p_sd );
- }
- else
+ if( !p_sds || !p_sds->p_sd )
{
msg_Warn( p_playlist, "module %s is not loaded", psz_module );
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,
+ p_sds->p_one );
+
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemAdded,
+ playlist_sd_item_added,
+ p_sds->p_cat );
+
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemRemoved,
+ playlist_sd_item_removed,
+ p_sds->p_one );
+
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemRemoved,
+ playlist_sd_item_removed,
+ p_sds->p_cat );
+
+ /* 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 );
+ }
+ PL_UNLOCK;
+
+ services_discovery_Destroy( p_sds->p_sd );
+ free( p_sds );
+
return VLC_SUCCESS;
}
-vlc_bool_t playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
+bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
const char *psz_module )
{
int i;
for( i = 0 ; i< p_playlist->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->pp_sds[i]->psz_module ) )
+ if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
{
PL_UNLOCK;
- return VLC_TRUE;
+ return true;
}
}
PL_UNLOCK;
- return VLC_FALSE;
+ return false;
}
-static void RunSD( services_discovery_t *p_sd )
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
{
- p_sd->pf_run( p_sd );
- return;
+ while( p_playlist->i_sds > 0 )
+ playlist_ServicesDiscoveryRemove( p_playlist,
+ p_playlist->pp_sds[0]->p_sd->psz_module );
}
+
projects / vlc / blobdiff