Commit 604adb7a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout_VolumeMute -> aout_ToggleMute

parent 385b4ac8
...@@ -451,8 +451,8 @@ VLC_EXPORT( int, __aout_VolumeInfos, ( vlc_object_t *, audio_volume_t * ) ); ...@@ -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 * ) ); 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) #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 * ) ); VLC_EXPORT( int, __aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) );
#define aout_VolumeMute(a, b) __aout_VolumeMute(VLC_OBJECT(a), b) #define aout_ToggleMute(a, b) __aout_ToggleMute(VLC_OBJECT(a), b)
VLC_EXPORT( int, __aout_VolumeMute, ( vlc_object_t *, audio_volume_t * ) ); 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_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 * ) ); VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
......
...@@ -286,7 +286,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -286,7 +286,7 @@ static void RunIntf( intf_thread_t *p_intf )
case GESTURE(UP,DOWN,NONE,NONE): case GESTURE(UP,DOWN,NONE,NONE):
case GESTURE(DOWN,UP,NONE,NONE): case GESTURE(DOWN,UP,NONE,NONE):
msg_Dbg( p_intf, "Mute sound" ); msg_Dbg( p_intf, "Mute sound" );
aout_VolumeMute( p_intf, NULL ); aout_ToggleMute( p_intf, NULL );
break; break;
case GESTURE(UP,RIGHT,NONE,NONE): case GESTURE(UP,RIGHT,NONE,NONE):
......
...@@ -197,7 +197,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -197,7 +197,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
case ACTIONID_VOL_MUTE: case ACTIONID_VOL_MUTE:
{ {
audio_volume_t i_newvol = -1; audio_volume_t i_newvol = -1;
aout_VolumeMute( p_intf, &i_newvol ); aout_ToggleMute( p_intf, &i_newvol );
if( p_vout ) if( p_vout )
{ {
if( i_newvol == 0 ) if( i_newvol == 0 )
......
...@@ -542,7 +542,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -542,7 +542,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
break; break;
case VOLUME_MUTE: case VOLUME_MUTE:
aout_VolumeMute( p_intf, NULL ); aout_ToggleMute( p_intf, NULL );
break; break;
case SELECT_CHANNEL: case SELECT_CHANNEL:
......
...@@ -170,7 +170,7 @@ void ActionsManager::frame() ...@@ -170,7 +170,7 @@ void ActionsManager::frame()
void ActionsManager::toggleMuteAudio() void ActionsManager::toggleMuteAudio()
{ {
aout_VolumeMute( p_intf, NULL ); aout_ToggleMute( p_intf, NULL );
} }
void ActionsManager::AudioUp() void ActionsManager::AudioUp()
......
...@@ -184,7 +184,7 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e ) ...@@ -184,7 +184,7 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
} }
else else
{ {
aout_VolumeMute( p_intf, NULL ); aout_ToggleMute( p_intf, NULL );
} }
e->accept(); e->accept();
return true; return true;
......
...@@ -111,7 +111,7 @@ void CmdFaster::execute() ...@@ -111,7 +111,7 @@ void CmdFaster::execute()
void CmdMute::execute() void CmdMute::execute()
{ {
aout_VolumeMute( getIntf(), NULL ); aout_TogleMute( getIntf(), NULL );
} }
......
...@@ -228,12 +228,12 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, ...@@ -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 * If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function (muted => 0). * 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; int i_result;
audio_volume_t i_volume; audio_volume_t i_volume;
......
...@@ -321,7 +321,7 @@ void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance, ...@@ -321,7 +321,7 @@ void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
{ {
VLC_UNUSED(p_e); 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, 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, ...@@ -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 ) ) 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 );
} }
} }
......
...@@ -30,7 +30,7 @@ aout_VisualChange ...@@ -30,7 +30,7 @@ aout_VisualChange
__aout_VolumeDown __aout_VolumeDown
__aout_VolumeGet __aout_VolumeGet
__aout_VolumeInfos __aout_VolumeInfos
__aout_VolumeMute __aout_ToggleMute
aout_VolumeNoneInit aout_VolumeNoneInit
__aout_VolumeSet __aout_VolumeSet
aout_VolumeSoftInit aout_VolumeSoftInit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment