/* 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 );
static void services_discovery_started( const vlc_event_t * p_event,
void * user_data )
{
- (void)p_event;
+ VLC_UNUSED(p_event);
libvlc_media_discoverer_t * p_mdis = user_data;
libvlc_event_t event;
p_mdis->running = true;
static void services_discovery_ended( const vlc_event_t * p_event,
void * user_data )
{
- (void)p_event;
+ VLC_UNUSED(p_event);
libvlc_media_discoverer_t * p_mdis = user_data;
libvlc_event_t event;
p_mdis->running = false;
libvlc_exception_t * p_e )
{
libvlc_media_discoverer_t * p_mdis;
-
+
p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
if( !p_mdis )
{
if( !p_mdis->p_sd )
{
- free( p_mdis );
+ libvlc_media_list_release( p_mdis->p_mlist );
libvlc_exception_raise( p_e, "Can't find the services_discovery module named '%s'", psz_name );
+ free( p_mdis );
return NULL;
}
services_discovery_ended,
p_mdis );
- services_discovery_Start( p_mdis->p_sd );
-
/* Here we go */
+ bool ret = services_discovery_Start( p_mdis->p_sd );
+ if(!ret)
+ {
+ libvlc_media_list_release( p_mdis->p_mlist );
+ libvlc_exception_raise( p_e, "Can't start the services_discovery module named '%s'", psz_name );
+ free( p_mdis );
+ return NULL;
+ }
return p_mdis;
}
int i;
libvlc_media_list_release( p_mdis->p_mlist );
- services_discovery_Destroy( p_mdis->p_sd );
+ services_discovery_StopAndRelease( p_mdis->p_sd );
/* Free catname_to_submedialist and all the mlist */
char ** all_keys = vlc_dictionary_all_keys( &p_mdis->catname_to_submedialist );
}
free( all_keys );
- vlc_dictionary_clear( &p_mdis->catname_to_submedialist );
+ vlc_dictionary_clear( &p_mdis->catname_to_submedialist, NULL, NULL );
free( p_mdis );
}
{
return p_mdis->running;
}
-