* 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 );
/***********************************************************************
* GetServicesNames
***********************************************************************/
-char ** services_discovery_GetServicesNames( vlc_object_t * p_super )
+char ** __services_discovery_GetServicesNames( vlc_object_t * p_super,
+ char ***pppsz_longnames )
{
- return module_GetModulesNamesForCapability( p_super, "services_discovery" );
+ return module_GetModulesNamesForCapability( p_super, "services_discovery",
+ pppsz_longnames );
}
/***********************************************************************
services_discovery_t *
services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name )
{
- 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;
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, VLC_TRUE );
+ 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_destroy( p_sd );
+ vlc_object_release( p_sd );
return NULL;
}
p_sd->psz_module = strdup( psz_module_name );
- p_sd->b_die = VLC_FALSE; /* FIXME */
+ p_sd->b_die = false; /* FIXME */
vlc_object_attach( p_sd, p_super );
return p_sd;
free( p_sd->psz_localized_name );
vlc_object_detach( p_sd );
- vlc_object_destroy( p_sd );
+ vlc_object_release( p_sd );
}
/***********************************************************************
{
if ((p_sd->pf_run != NULL)
&& vlc_thread_create( p_sd, "services_discovery", RunSD,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE))
+ VLC_THREAD_PRIORITY_LOW, false))
{
msg_Err( p_sd, "cannot create services discovery thread" );
- vlc_object_destroy( p_sd );
+ 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 )
{
- vlc_object_kill( 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 );
void
services_discovery_SetLocalizedName ( services_discovery_t * p_sd, const char *psz )
{
- if(p_sd->psz_localized_name) free( p_sd->psz_localized_name );
+ free( p_sd->psz_localized_name );
p_sd->psz_localized_name = strdup(psz);
}
***********************************************************************/
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;
}
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_parent->p_playlist, "Adding %s in %s",
+ 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 )
+ 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_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;
+ 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 */
{
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 );
- playlist_DeleteInputInParent( p_parent->p_playlist, p_input->i_id,
- p_parent, VLC_FALSE );
+ vlc_object_unlock( p_parent->p_playlist );
}
int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modules )
for (;;)
{
- struct playlist_archived_services_discovery_t * p_asd;
+ struct playlist_services_discovery_support_t * p_sds;
playlist_item_t * p_cat;
playlist_item_t * p_one;
continue;
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;
- }
- p_sd->p_cat = p_cat;
- p_sd->p_one = p_one;
+ 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,
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;
+ 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->p_internal->i_asds, p_playlist->p_internal->pp_asds, p_asd );
+ TAB_APPEND( p_playlist->i_sds, p_playlist->pp_sds, p_sds );
PL_UNLOCK;
}
int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
const char *psz_module )
{
+ struct playlist_services_discovery_support_t * p_sds = NULL;
int i;
- struct playlist_archived_services_discovery_t *p_asd = NULL;
PL_LOCK;
- for( i = 0 ; i< p_playlist->p_internal->i_asds ; i ++ )
+ for( i = 0 ; i< p_playlist->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->p_internal->pp_asds[i]->p_sd->psz_module ) )
+ if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
{
- 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 = p_playlist->pp_sds[i];
+ REMOVE_ELEM( p_playlist->pp_sds, p_playlist->i_sds, i );
break;
}
}
PL_UNLOCK;
- if( p_asd && p_asd->p_sd )
+ if( !p_sds || !p_sds->p_sd )
{
- services_discovery_Stop( p_asd->p_sd );
-
- vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ),
- vlc_ServicesDiscoveryItemAdded,
- playlist_sd_item_added,
- p_asd->p_one );
+ msg_Warn( p_playlist, "module %s is not loaded", psz_module );
+ return VLC_EGENERIC;
+ }
- vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ),
- vlc_ServicesDiscoveryItemAdded,
- playlist_sd_item_added,
- p_asd->p_cat );
+ services_discovery_Stop( p_sds->p_sd );
- 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_sds->p_sd ),
+ vlc_ServicesDiscoveryItemAdded,
+ playlist_sd_item_added,
+ p_sds->p_one );
- vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ),
- vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed,
- p_asd->p_cat );
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemAdded,
+ playlist_sd_item_added,
+ p_sds->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;
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemRemoved,
+ playlist_sd_item_removed,
+ p_sds->p_one );
- services_discovery_Destroy( p_asd->p_sd );
+ vlc_event_detach( services_discovery_EventManager( p_sds->p_sd ),
+ vlc_ServicesDiscoveryItemRemoved,
+ playlist_sd_item_removed,
+ p_sds->p_cat );
- free( p_asd );
- }
- else
+ /* 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 )
{
- msg_Warn( p_playlist, "module %s is not loaded", psz_module );
- return VLC_EGENERIC;
+ 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;
PL_LOCK;
- for( i = 0 ; i< p_playlist->p_internal->i_asds ; i ++ )
+ for( i = 0 ; i< p_playlist->i_sds ; i ++ )
{
- if( !strcmp( psz_module, p_playlist->p_internal->pp_asds[i]->p_sd->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;
+}
+
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
+{
+ while( p_playlist->i_sds > 0 )
+ playlist_ServicesDiscoveryRemove( p_playlist,
+ p_playlist->pp_sds[0]->p_sd->psz_module );
}
projects / vlc / blobdiff