#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <assert.h>
-#include "vlc_playlist.h"
+#include "vlc_services_discovery.h"
/*
* Private functions
*/
-
+
/**************************************************************************
* services_discovery_item_added (Private) (VLC event callback)
**************************************************************************/
void * user_data )
{
input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
- libvlc_media_descriptor_t * p_md;
+ const char * psz_cat = p_event->u.services_discovery_item_added.psz_category;
+ libvlc_media_t * p_md;
libvlc_media_discoverer_t * p_mdis = user_data;
+ libvlc_media_list_t * p_mlist = p_mdis->p_mlist;
- p_md = libvlc_media_descriptor_new_from_input_item(
+ p_md = libvlc_media_new_from_input_item(
p_mdis->p_libvlc_instance,
p_item, NULL );
- libvlc_media_list_lock( p_mdis->p_mlist );
- libvlc_media_list_add_media_descriptor( p_mdis->p_mlist, p_md, NULL );
- libvlc_media_list_unlock( p_mdis->p_mlist );
+ /* If we have a category, that mean we have to group the items having
+ * that category in a media_list. */
+ if( psz_cat )
+ {
+ p_mlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, psz_cat );
+
+ if( p_mlist == kVLCDictionaryNotFound )
+ {
+ libvlc_media_t * p_catmd;
+ p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL );
+ p_mlist = libvlc_media_subitems( p_catmd, NULL );
+ p_mlist->b_read_only = true;
+
+ /* Insert the newly created mlist in our dictionary */
+ vlc_dictionary_insert( &p_mdis->catname_to_submedialist, psz_cat, p_mlist );
+
+ /* Insert the md into the root list */
+ libvlc_media_list_lock( p_mdis->p_mlist );
+ _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd, NULL );
+ libvlc_media_list_unlock( p_mdis->p_mlist );
+
+ /* We don't release the mlist cause the dictionary
+ * doesn't retain the object. But we release the md. */
+ libvlc_media_release( p_catmd );
+ }
+ }
+ else
+ {
+ libvlc_media_list_lock( p_mlist );
+ _libvlc_media_list_add_media( p_mlist, p_md, NULL );
+ libvlc_media_list_unlock( p_mlist );
+ }
}
/**************************************************************************
static void services_discovery_item_removed( const vlc_event_t * p_event,
void * user_data )
{
- /* Not handled */
+ input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
+ libvlc_media_t * p_md;
+ libvlc_media_discoverer_t * p_mdis = user_data;
+
+ int i, count = libvlc_media_list_count( p_mdis->p_mlist, NULL );
+ libvlc_media_list_lock( p_mdis->p_mlist );
+ for( i = 0; i < count; i++ )
+ {
+ p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i, NULL );
+ if( p_md->p_input_item == p_item )
+ {
+ _libvlc_media_list_remove_index( p_mdis->p_mlist, i, NULL );
+ break;
+ }
+ }
+ libvlc_media_list_unlock( p_mdis->p_mlist );
+}
+
+/**************************************************************************
+ * services_discovery_started (Private) (VLC event callback)
+ **************************************************************************/
+
+static void services_discovery_started( const vlc_event_t * p_event,
+ void * user_data )
+{
+ VLC_UNUSED(p_event);
+ libvlc_media_discoverer_t * p_mdis = user_data;
+ libvlc_event_t event;
+ p_mdis->running = true;
+ event.type = libvlc_MediaDiscovererStarted;
+ libvlc_event_send( p_mdis->p_event_manager, &event );
+}
+
+/**************************************************************************
+ * services_discovery_ended (Private) (VLC event callback)
+ **************************************************************************/
+
+static void services_discovery_ended( const vlc_event_t * p_event,
+ void * user_data )
+{
+ VLC_UNUSED(p_event);
+ libvlc_media_discoverer_t * p_mdis = user_data;
+ libvlc_event_t event;
+ p_mdis->running = false;
+ event.type = libvlc_MediaDiscovererEnded;
+ libvlc_event_send( p_mdis->p_event_manager, &event );
}
/*
libvlc_exception_t * p_e )
{
libvlc_media_discoverer_t * p_mdis;
-
+
p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
if( !p_mdis )
{
p_mdis->p_libvlc_instance = p_inst;
p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL );
+ p_mdis->p_mlist->b_read_only = true;
+ p_mdis->running = false;
+
+ vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 );
+
+ p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis,
+ p_inst, NULL );
+
+ libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
+ libvlc_MediaDiscovererStarted, NULL );
+ libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
+ libvlc_MediaDiscovererEnded, NULL );
+
p_mdis->p_sd = services_discovery_Create( (vlc_object_t*)p_inst->p_libvlc_int, psz_name );
if( !p_mdis->p_sd )
vlc_ServicesDiscoveryItemRemoved,
services_discovery_item_removed,
p_mdis );
-
+ vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryStarted,
+ services_discovery_started,
+ p_mdis );
+ vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryEnded,
+ services_discovery_ended,
+ p_mdis );
+
services_discovery_Start( p_mdis->p_sd );
/* Here we go */
void
libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
{
+ int i;
+
libvlc_media_list_release( p_mdis->p_mlist );
services_discovery_Destroy( p_mdis->p_sd );
+
+ /* Free catname_to_submedialist and all the mlist */
+ char ** all_keys = vlc_dictionary_all_keys( &p_mdis->catname_to_submedialist );
+ for( i = 0; all_keys[i]; i++ )
+ {
+ libvlc_media_list_t * p_catmlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, all_keys[i] );
+ libvlc_media_list_release( p_catmlist );
+ free( all_keys[i] );
+ }
+ free( all_keys );
+
+ vlc_dictionary_clear( &p_mdis->catname_to_submedialist );
+
free( p_mdis );
}
return p_mdis->p_mlist;
}
+/**************************************************************************
+ * event_manager (Public)
+ **************************************************************************/
+libvlc_event_manager_t *
+libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis )
+{
+ return p_mdis->p_event_manager;
+}
+
+
+/**************************************************************************
+ * running (Public)
+ **************************************************************************/
+int
+libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis )
+{
+ return p_mdis->running;
+}
projects / vlc / blobdiff