aout_VolumeMute -> aout_ToggleMute

include/vlc_aout.h

@@ -451,8 +451,8 @@ VLC_EXPORT( int, __aout_VolumeInfos, ( vlc_object_t *, audio_volume_t * ) );
 VLC_EXPORT( int, __aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) );
 #define aout_VolumeDown(a, b, c) __aout_VolumeDown(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) );
-#define aout_VolumeMute(a, b) __aout_VolumeMute(VLC_OBJECT(a), b)
-VLC_EXPORT( int, __aout_VolumeMute, ( vlc_object_t *, audio_volume_t * ) );
+#define aout_ToggleMute(a, b) __aout_ToggleMute(VLC_OBJECT(a), b)
+VLC_EXPORT( int, __aout_ToggleMute, ( vlc_object_t *, audio_volume_t * ) );
 VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
 VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
 

modules/control/gestures.c

@@ -286,7 +286,7 @@ static void RunIntf( intf_thread_t *p_intf )
             case GESTURE(UP,DOWN,NONE,NONE):
             case GESTURE(DOWN,UP,NONE,NONE):
                 msg_Dbg( p_intf, "Mute sound" );
-                aout_VolumeMute( p_intf, NULL );
+                aout_ToggleMute( p_intf, NULL );
                 break;
 
             case GESTURE(UP,RIGHT,NONE,NONE):

modules/control/hotkeys.c

@@ -197,7 +197,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_MUTE:
         {
             audio_volume_t i_newvol = -1;
-            aout_VolumeMute( p_intf, &i_newvol );
+            aout_ToggleMute( p_intf, &i_newvol );
             if( p_vout )
             {
                 if( i_newvol == 0 )

modules/gui/beos/InterfaceWindow.cpp

@@ -542,7 +542,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
             break;
 
         case VOLUME_MUTE:
-            aout_VolumeMute( p_intf, NULL );
+            aout_ToggleMute( p_intf, NULL );
             break;
 
         case SELECT_CHANNEL:

modules/gui/qt4/actions_manager.cpp

@@ -170,7 +170,7 @@ void ActionsManager::frame()
 
 void ActionsManager::toggleMuteAudio()
 {
-     aout_VolumeMute( p_intf, NULL );
+     aout_ToggleMute( p_intf, NULL );
 }
 
 void ActionsManager::AudioUp()

modules/gui/qt4/components/controller_widget.cpp

@@ -184,7 +184,7 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
         }
         else
         {
-            aout_VolumeMute( p_intf, NULL );
+            aout_ToggleMute( p_intf, NULL );
         }
         e->accept();
         return true;

modules/gui/skins2/commands/cmd_input.cpp

@@ -111,7 +111,7 @@ void CmdFaster::execute()
 
 void CmdMute::execute()
 {
-    aout_VolumeMute( getIntf(), NULL );
+    aout_TogleMute( getIntf(), NULL );
 }
 
 

src/audio_output/intf.c

@@ -228,12 +228,12 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
 }
 
 /*****************************************************************************
- * aout_VolumeMute : Mute/un-mute the output volume
+ * aout_ToggleMute : Mute/un-mute the output volume
  *****************************************************************************
  * If pi_volume != NULL, *pi_volume will contain the volume at the end of the
  * function (muted => 0).
  *****************************************************************************/
-int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
+int __aout_ToggleMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
 {
     int i_result;
     audio_volume_t i_volume;

src/control/audio.c

@@ -321,7 +321,7 @@ void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
 {
     VLC_UNUSED(p_e);
 
-    aout_VolumeMute( p_instance->p_libvlc_int, NULL );
+    aout_ToggleMute( p_instance->p_libvlc_int, NULL );
 }
 
 int libvlc_audio_get_mute( libvlc_instance_t *p_instance,
@@ -335,7 +335,7 @@ void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute,
 {
     if ( mute ^ libvlc_audio_get_mute( p_instance, p_e ) )
     {
-        aout_VolumeMute( p_instance->p_libvlc_int, NULL );
+        aout_ToggleMute( p_instance->p_libvlc_int, NULL );
     }
 }
 

src/libvlccore.sym

@@ -30,7 +30,7 @@ aout_VisualChange
 __aout_VolumeDown
 __aout_VolumeGet
 __aout_VolumeInfos
-__aout_VolumeMute
+__aout_ToggleMute
 aout_VolumeNoneInit
 __aout_VolumeSet
 aout_VolumeSoftInit