From a1416de0dc192cca29948ceaf1017bd14751613a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 31 Jan 2010 13:31:02 +0200 Subject: [PATCH] Kill one exception --- include/vlc/libvlc_media_player.h | 9 ++++----- src/control/audio.c | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index 6b248fbbee..4f47f580c8 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -933,13 +933,12 @@ typedef enum libvlc_audio_output_channel_t { * Get the list of available audio outputs * * \param p_instance libvlc instance - * \param p_e an initialized exception pointer - * \return list of available audio outputs, at the end free it with -* \see libvlc_audio_output_list_release \see libvlc_audio_output_t + * \return list of available audio outputs. It must be freed it with +* \see libvlc_audio_output_list_release \see libvlc_audio_output_t . + * In case of error, NULL is returned. */ VLC_PUBLIC_API libvlc_audio_output_t * - libvlc_audio_output_list_get( libvlc_instance_t *, - libvlc_exception_t * ); + libvlc_audio_output_list_get( libvlc_instance_t * ); /** * Free the list of available audio outputs diff --git a/src/control/audio.c b/src/control/audio.c index 949d28d3cc..ab90312775 100644 --- a/src/control/audio.c +++ b/src/control/audio.c @@ -64,8 +64,7 @@ static aout_instance_t *GetAOut( libvlc_instance_t *p_instance, * Get the list of available audio outputs *****************************************/ libvlc_audio_output_t * - libvlc_audio_output_list_get( libvlc_instance_t *p_instance, - libvlc_exception_t *p_e ) + libvlc_audio_output_list_get( libvlc_instance_t *p_instance ) { VLC_UNUSED( p_instance ); libvlc_audio_output_t *p_list = NULL, @@ -85,7 +84,6 @@ libvlc_audio_output_t * malloc( sizeof( libvlc_audio_output_t ) ); if( p_actual == NULL ) { - libvlc_exception_raise( p_e ); libvlc_printerr( "Not enough memory" ); libvlc_audio_output_list_release( p_list ); module_list_free( module_list ); -- 2.39.2