/* 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_add_media( p_mdis->p_mlist, p_catmd );
libvlc_media_list_unlock( p_mdis->p_mlist );
/* We don't release the mlist cause the dictionary
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 );
- }
+
+ libvlc_media_list_lock( p_mlist );
+ _libvlc_media_list_add_media( p_mlist, p_md );
+ libvlc_media_list_unlock( p_mlist );
+
+ libvlc_media_release( p_md );
}
/**************************************************************************
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 );
+ int i, count = libvlc_media_list_count( p_mdis->p_mlist );
libvlc_media_list_lock( p_mdis->p_mlist );
for( i = 0; i < count; i++ )
{
}
p_mdis->p_libvlc_instance = p_inst;
- p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL );
+ p_mdis->p_mlist = libvlc_media_list_new( p_inst );
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 );
+ p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis, p_inst );
+ if( unlikely(p_mdis->p_event_manager == NULL) )
+ {
+ free( p_mdis );
+ return NULL;
+ }
libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
- libvlc_MediaDiscovererStarted, NULL );
+ libvlc_MediaDiscovererStarted );
libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
- libvlc_MediaDiscovererEnded, NULL );
+ libvlc_MediaDiscovererEnded );
p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int );
{
int i;
+ vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryItemAdded,
+ services_discovery_item_added,
+ p_mdis );
+ vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryItemRemoved,
+ services_discovery_item_removed,
+ p_mdis );
+ vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryStarted,
+ services_discovery_started,
+ p_mdis );
+ vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ),
+ vlc_ServicesDiscoveryEnded,
+ services_discovery_ended,
+ p_mdis );
+
libvlc_media_list_release( p_mdis->p_mlist );
+
vlc_sd_StopAndDestroy( p_mdis->p_sd );
/* Free catname_to_submedialist and all the mlist */