libvlc_audio_*: remove useless exception parameters

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 9e54525cdd88cc1fbb34a3072fb6ad298c0ef8c5..3727ac8ce4d473f240ceb6805c1e65c0ae1aaf4b 100644 (file)
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -962,27 +962,24 @@ VLC_PUBLIC_API void libvlc_audio_output_set_device_type( libvlc_instance_t *,
  * Toggle mute status.
  *
  * \param p_instance libvlc instance
- * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_instance_t * );
 
 /**
  * Get current mute status.
  *
  * \param p_instance libvlc instance
- * \param p_e an initialized exception pointer
  * \return the mute status (boolean)
  */
-VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_instance_t * );
 
 /**
  * Set mute status.
  *
  * \param p_instance libvlc instance
  * \param status If status is true then mute, otherwise unmute
- * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, int , libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, int );
 
 /**
  * Get current audio level.
@@ -991,7 +988,7 @@ VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, int , libvlc_exc
  * \param p_e an initialized exception pointer
  * \return the audio level (int)
  */
-VLC_PUBLIC_API int libvlc_audio_get_volume( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_audio_get_volume( libvlc_instance_t * );
 
 /**
  * Set current audio level.

diff --git a/projects/activex/plugin.cpp b/projects/activex/plugin.cpp
index 1bd4a88f9b0388851fa442484a6ad2efad7a509b..1f027ce47177ea56d2d990de1c8b36cdef5de0ad 100644 (file)
--- a/projects/activex/plugin.cpp
+++ b/projects/activex/plugin.cpp
@@ -504,7 +504,7 @@ void VLCPlugin::initVLC()
     libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
     if( _b_mute )
     {
-        libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
+        libvlc_audio_set_mute(_p_libvlc, TRUE);
     }
 
     // initial playlist item

diff --git a/projects/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp
index 266b46ce949b91002e4b40dcae37ed591f0b9552..8e7f135cd45a297d5ef093880b6092d989fb96c4 100644 (file)
--- a/projects/activex/vlccontrol.cpp
+++ b/projects/activex/vlccontrol.cpp
@@ -349,13 +349,7 @@ STDMETHODIMP VLCControl::toggleMute(void)
     libvlc_instance_t* p_libvlc;
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_audio_toggle_mute(p_libvlc, &ex);
-        result = exception_bridge(&ex);
-    }
+        libvlc_audio_toggle_mute(p_libvlc);
     return result;
 };
 

diff --git a/projects/activex/vlccontrol2.cpp b/projects/activex/vlccontrol2.cpp
index 4aeac925e9086b13d8cf9e89cea6ec253e197599..05080bc0da7cb99ab47efe964d1d6eb1a0fbc152 100644 (file)
--- a/projects/activex/vlccontrol2.cpp
+++ b/projects/activex/vlccontrol2.cpp
@@ -148,14 +148,8 @@ STDMETHODIMP VLCAudio::get_mute(VARIANT_BOOL* mute)
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *mute = libvlc_audio_get_mute(p_libvlc, &ex) ?
+        *mute = libvlc_audio_get_mute(p_libvlc) ?
                         VARIANT_TRUE : VARIANT_FALSE;
-        hr = exception_bridge(&ex);
-    }
     return hr;
 };
 
@@ -164,13 +158,7 @@ STDMETHODIMP VLCAudio::put_mute(VARIANT_BOOL mute)
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute, &ex);
-        hr = exception_bridge(&ex);
-    }
+        libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute);
     return hr;
 };
 
@@ -182,13 +170,7 @@ STDMETHODIMP VLCAudio::get_volume(long* volume)
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *volume = libvlc_audio_get_volume(p_libvlc, &ex);
-        hr = exception_bridge(&ex);
-    }
+        *volume = libvlc_audio_get_volume(p_libvlc);
     return hr;
 };
 
@@ -349,13 +331,7 @@ STDMETHODIMP VLCAudio::toggleMute()
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_audio_toggle_mute(p_libvlc, &ex);
-        hr = exception_bridge(&ex);
-    }
+        libvlc_audio_toggle_mute(p_libvlc);
     return hr;
 };
 

diff --git a/projects/macosx/framework/Sources/VLCAudio.m b/projects/macosx/framework/Sources/VLCAudio.m
index f511a7ff7b93bccb9c8c93f360339b8184cefbe1..a5690af7b878686a3a256eca341d691ea56b6f75 100644 (file)
--- a/projects/macosx/framework/Sources/VLCAudio.m
+++ b/projects/macosx/framework/Sources/VLCAudio.m
@@ -50,17 +50,12 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
 
 - (void)setMute:(BOOL)value
 {
-    libvlc_audio_set_mute([library instance], value, NULL);
+    libvlc_audio_set_mute([library instance], value);
 }
 
 - (BOOL)isMuted
 {
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-    BOOL result = libvlc_audio_get_mute([library instance], &ex);
-    catch_exception(&ex);
-    
-    return result;
+    return libvlc_audio_get_mute([library instance]);
 }
 
 - (void)setVolume:(int)value
@@ -74,10 +69,6 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
 
 - (int)volume
 {
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-    int result = libvlc_audio_get_volume([library instance], &ex);
-    catch_exception(&ex);
-    return result;
+    return libvlc_audio_get_volume([library instance]);
 }
 @end

diff --git a/projects/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
index 73d198e1d2247f72b29064e2141b761b6639e3b9..ae53301b5bb17d1bfe4f1d36c6b0c05f488fdbd1 100644 (file)
--- a/projects/mozilla/control/npolibvlc.cpp
+++ b/projects/mozilla/control/npolibvlc.cpp
@@ -225,8 +225,7 @@ LibvlcAudioNPObject::getProperty(int index, NPVariant &result)
             }
             case ID_audio_volume:
             {
-                int volume = libvlc_audio_get_volume(p_plugin->getVLC(), &ex);
-                RETURN_ON_EXCEPTION(this,ex);
+                int volume = libvlc_audio_get_volume(p_plugin->getVLC());
                 INT32_TO_NPVARIANT(volume, result);
                 return INVOKERESULT_NO_ERROR;
             }
@@ -280,8 +279,7 @@ LibvlcAudioNPObject::setProperty(int index, const NPVariant &value)
                 if( NPVARIANT_IS_BOOLEAN(value) )
                 {
                     libvlc_audio_set_mute(p_plugin->getVLC(),
-                                          NPVARIANT_TO_BOOLEAN(value), &ex);
-                    RETURN_ON_EXCEPTION(this,ex);
+                                          NPVARIANT_TO_BOOLEAN(value));
                     return INVOKERESULT_NO_ERROR;
                 }
                 return INVOKERESULT_INVALID_VALUE;
@@ -349,8 +347,7 @@ LibvlcAudioNPObject::invoke(int index, const NPVariant *args,
             case ID_audio_togglemute:
                 if( argCount == 0 )
                 {
-                    libvlc_audio_toggle_mute(p_plugin->getVLC(), &ex);
-                    RETURN_ON_EXCEPTION(this,ex);
+                    libvlc_audio_toggle_mute(p_plugin->getVLC());
                     VOID_TO_NPVARIANT(result);
                     return INVOKERESULT_NO_ERROR;
                 }

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 293f10615ebea15a170d053b9e5bbc2166f5329e..34526c08228f08f83387d7916b1e8c543107f9c1 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -748,8 +748,7 @@ void VlcPlugin::redrawToolbar()
     libvlc_exception_init( &ex );
 
     /* get mute info */
-    b_mute = libvlc_audio_get_mute( getVLC(), &ex );
-    libvlc_exception_clear( &ex );
+    b_mute = libvlc_audio_get_mute( getVLC() );
 
     gcv.foreground = BlackPixel( p_display, 0 );
     gc = XCreateGC( p_display, control, GCForeground, &gcv );
@@ -857,8 +856,7 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos
     libvlc_exception_clear( &ex );
 
     /* get mute info */
-    b_mute = libvlc_audio_get_mute( getVLC(), &ex );
-    libvlc_exception_clear( &ex );
+    b_mute = libvlc_audio_get_mute( getVLC() );
 
     /* is Pause of Play button clicked */
     if( (is_playing != 1) &&

diff --git a/src/control/audio.c b/src/control/audio.c
index 4ff09fd1bd4d3948386d7a1d3fb192ce7216a5ac..949d28d3cc55b4dec487828cae5a3a23e91cebc6 100644 (file)
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -313,24 +313,19 @@ void libvlc_audio_output_set_device_type( libvlc_instance_t *p_instance,
 /*****************************************************************************
  * libvlc_audio_get_mute : Get the volume state, true if muted
  *****************************************************************************/
-void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
-                               libvlc_exception_t *p_e )
+void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance )
 {
-    VLC_UNUSED(p_e);
-
     aout_ToggleMute( p_instance->p_libvlc_int, NULL );
 }
 
-int libvlc_audio_get_mute( libvlc_instance_t *p_instance,
-                           libvlc_exception_t *p_e )
+int libvlc_audio_get_mute( libvlc_instance_t *p_instance )
 {
-    return (libvlc_audio_get_volume(p_instance, p_e) == 0);
+    return (libvlc_audio_get_volume(p_instance) == 0);
 }
 
-void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute,
-                            libvlc_exception_t *p_e )
+void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute )
 {
-    if ( mute ^ libvlc_audio_get_mute( p_instance, p_e ) )
+    if ( !mute != !libvlc_audio_get_mute( p_instance ) )
     {
         aout_ToggleMute( p_instance->p_libvlc_int, NULL );
     }
@@ -339,11 +334,8 @@ void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute,
 /*****************************************************************************
  * libvlc_audio_get_volume : Get the current volume (range 0-200 %)
  *****************************************************************************/
-int libvlc_audio_get_volume( libvlc_instance_t *p_instance,
-                             libvlc_exception_t *p_e )
+int libvlc_audio_get_volume( libvlc_instance_t *p_instance )
 {
-    VLC_UNUSED(p_e);
-
     audio_volume_t i_volume;
 
     aout_VolumeGet( p_instance->p_libvlc_int, &i_volume );

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index 9afb08cf9f0105b96d1e833f23660ededb85a0c4..da538cc648f1fa6570e6c26b5d61309c5c775ab1 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -206,14 +206,11 @@ unsigned short
 mediacontrol_sound_get_volume( mediacontrol_Instance *self,
                                mediacontrol_Exception *exception )
 {
-    libvlc_exception_t ex;
     int i_ret = 0;
 
     mediacontrol_exception_init( exception );
-    libvlc_exception_init( &ex );
 
-    i_ret = libvlc_audio_get_volume( self->p_instance, &ex );
-    HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
+    i_ret = libvlc_audio_get_volume( self->p_instance );
     /* FIXME: Normalize in [0..100] */
     return (unsigned short)i_ret;
 }