aout_VolumeMute -> aout_ToggleMute

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 21b67fbdb6a47e4ed8a9a93ab569da508bed4cdc..f1ecbd593c21f13ba14921ea9885c37e59313ae3 100644 (file)
--- a/include/vlc_aout.h
+++ b/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 * ) );
 

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index ef9e5ac61b326ed5e7d5d18698cbe541e11c59b0..2f4b00353b222a8728aa7189f12c4f8ecd8e1596 100644 (file)
--- a/modules/control/gestures.c
+++ b/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):

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 817fd0a6284100fd924df150c7820752c904fa30..f6cb2573dc6bd7b54ba09bc244cb5855a6ed7e95 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/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 )

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 79873d589765e21f995f9ac42bed5ccf72237500..59b688cf2d798e14a58da30b2487d6ac51ae2ad2 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/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:

diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index ed5cd71cd8eafde3c6e5dd24f520fe871d073aae..e4c00534e7113bcbee9ff83a016c7136a858a41e 100644 (file)
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/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()

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 5276cd8acf01d2a0fe8003eb79a6abb0d082ad29..a680339648565aa28b42bdf84ac2e4f09ba6bd98 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/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;

diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp
index 4e76107aca827621d8fd9ec0d964de81f56de0fa..c91b0aaca3f03a46b589e4b5497932fdd33c68b4 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.cpp
+++ b/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 );
 }
 
 

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index a780db6b251674f3bad957e405cf6c4b9ce5aad6..409ca68f638735b120b756e3e602a8e38a6c83d6 100644 (file)
--- a/src/audio_output/intf.c
+++ b/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;

diff --git a/src/control/audio.c b/src/control/audio.c
index fb96b70b087a06a4b99f65a462b32b1989439586..0146bbe9016467e0c4c0252b3130b97b2889e619 100644 (file)
--- a/src/control/audio.c
+++ b/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 );
     }
 }
 

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 3d1a407bd03d25c18bcc9e5177bceeb8a7b78abd..bb2fbc1a50d3a71d040ad17657d2878fa4b76252 100644 (file)
--- a/src/libvlccore.sym
+++ b/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