*
* \param p_inst libvlc instance
* \param psz_name service name
- * \param p_e an initialized exception object
- * \return media discover object
+ * \return media discover object or NULL in case of error
*/
VLC_PUBLIC_API 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 );
/**
* Release media discover object. If the reference count reaches 0, then
**************************************************************************/
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;
}
if( !p_mdis->p_sd )
{
- 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;
}
/* Here we go */
if( !vlc_sd_Start( p_mdis->p_sd, psz_name ) )
{
- libvlc_media_list_release( p_mdis->p_mlist );
- libvlc_exception_raise( p_e );
libvlc_printerr( "%s: internal module error", psz_name );
+ libvlc_media_list_release( p_mdis->p_mlist );
+ libvlc_event_manager_release( p_mdis->p_event_manager );
free( p_mdis );
return NULL;
}