libvlc_media_discoverer_t * p_mdis = user_data;
libvlc_media_list_t * p_mlist = p_mdis->p_mlist;
- p_md = libvlc_media_new_from_input_item(
- p_mdis->p_libvlc_instance,
- p_item, NULL );
+ p_md = libvlc_media_new_from_input_item( p_mdis->p_libvlc_instance,
+ p_item );
/* If we have a category, that mean we have to group the items having
* that category in a media_list. */
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_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat );
p_mlist = libvlc_media_subitems( p_catmd );
p_mlist->b_read_only = true;
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 );
+ p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i );
if( p_md->p_input_item == p_item )
{
- _libvlc_media_list_remove_index( p_mdis->p_mlist, i, NULL );
+ _libvlc_media_list_remove_index( p_mdis->p_mlist, i );
break;
}
}
**************************************************************************/
libvlc_media_discoverer_t *
libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
- const char * psz_name,
- libvlc_exception_t * p_e )
+ const char * psz_name )
{
libvlc_media_discoverer_t * p_mdis;
p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
- if( !p_mdis )
+ if( unlikely(!p_mdis) )
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
return NULL;
}
libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
libvlc_MediaDiscovererEnded );
- p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int );
-
- if( !p_mdis->p_sd )
+ p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int,
+ psz_name );
+ if( unlikely(p_mdis->p_sd == NULL) )
{
- libvlc_media_list_release( p_mdis->p_mlist );
- libvlc_exception_raise( p_e );
libvlc_printerr( "%s: no such discovery module found", psz_name );
+ libvlc_media_list_release( p_mdis->p_mlist );
+ libvlc_event_manager_release( p_mdis->p_event_manager );
free( p_mdis );
return NULL;
}
p_mdis );
/* Here we go */
- if( !vlc_sd_Start( p_mdis->p_sd, psz_name ) )
+ if( !vlc_sd_Start( p_mdis->p_sd ) )
{
+ libvlc_printerr( "%s: internal module error",
+ psz_name );
libvlc_media_list_release( p_mdis->p_mlist );
- libvlc_exception_raise( p_e );
- libvlc_printerr( "%s: internal module error", psz_name );
+ libvlc_event_manager_release( p_mdis->p_event_manager );
free( p_mdis );
return NULL;
}