aout: remove aout_MuteToggle()

diff --git a/include/vlc_aout_intf.h b/include/vlc_aout_intf.h
index 248d7f3c80e4246341ab1e1539351ab0d2c639e3..204f8bccf1245115c9a2829a7ee43ece31c1c06c 100644 (file)
--- a/include/vlc_aout_intf.h
+++ b/include/vlc_aout_intf.h
@@ -38,13 +38,4 @@ VLC_API int aout_MuteSet( vlc_object_t *, bool );
 VLC_API int aout_MuteGet( vlc_object_t * );
 #define aout_MuteGet(a) aout_MuteGet(VLC_OBJECT(a))
 
-static inline int aout_MuteToggle (vlc_object_t *obj)
-{
-    int val = aout_MuteGet (obj);
-    if (val >= 0)
-        val = aout_MuteSet (obj, !val);
-    return val;
-}
-#define aout_MuteToggle(a) aout_MuteToggle(VLC_OBJECT(a))
-
 #endif /* _VLC_AOUT_H */

diff --git a/lib/audio.c b/lib/audio.c
index 7ae1966ad6947a37b6c4339154b1e3a9b7632c98..3183ad94329f22a8ea069bcf9bc8a655622cb159 100644 (file)
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -249,7 +249,9 @@ void libvlc_audio_output_set_device_type( libvlc_media_player_t *mp,
 
 void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )
 {
-    aout_MuteToggle( mp );
+    int mute = libvlc_audio_get_mute( mp );
+    if( mute != -1 )
+        libvlc_audio_set_mute( mp, !mute );
 }
 
 int libvlc_audio_get_mute( libvlc_media_player_t *mp )