| Index: webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
|
| diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
|
| index 8bc63c3806f2f29cae493d3036be4a557b04ff9c..9ce0ca10e45623ce6bc53c74a15b9512d2475008 100644
|
| --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
|
| +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
|
| @@ -534,22 +534,6 @@ int32_t AudioMixerManagerLinuxALSA::MinSpeakerVolume(
|
| }
|
| */
|
|
|
| -int32_t AudioMixerManagerLinuxALSA::SpeakerVolumeStepSize(
|
| - uint16_t& stepSize) const
|
| -{
|
| -
|
| - if (_outputMixerHandle == NULL)
|
| - {
|
| - LOG(LS_WARNING) << "no avaliable output mixer exists";
|
| - return -1;
|
| - }
|
| -
|
| - // The step size is always 1 for ALSA
|
| - stepSize = 1;
|
| -
|
| - return 0;
|
| -}
|
| -
|
| int32_t AudioMixerManagerLinuxALSA::SpeakerVolumeIsAvailable(
|
| bool& available)
|
| {
|
| @@ -743,63 +727,6 @@ int32_t AudioMixerManagerLinuxALSA::MicrophoneMute(bool& enabled) const
|
| return 0;
|
| }
|
|
|
| -int32_t AudioMixerManagerLinuxALSA::MicrophoneBoostIsAvailable(
|
| - bool& available)
|
| -{
|
| - if (_inputMixerHandle == NULL)
|
| - {
|
| - LOG(LS_WARNING) << "no avaliable input mixer exists";
|
| - return -1;
|
| - }
|
| -
|
| - // Microphone boost cannot be enabled through ALSA Simple Mixer Interface
|
| - available = false;
|
| -
|
| - return 0;
|
| -}
|
| -
|
| -int32_t AudioMixerManagerLinuxALSA::SetMicrophoneBoost(bool enable)
|
| -{
|
| - LOG(LS_VERBOSE) << "AudioMixerManagerLinuxALSA::SetMicrophoneBoost(enable="
|
| - << enable << ")";
|
| -
|
| - rtc::CritScope lock(&_critSect);
|
| -
|
| - if (_inputMixerHandle == NULL)
|
| - {
|
| - LOG(LS_WARNING) << "no avaliable input mixer exists";
|
| - return -1;
|
| - }
|
| -
|
| - // Ensure that the selected microphone destination has a valid mute control.
|
| - bool available(false);
|
| - MicrophoneMuteIsAvailable(available);
|
| - if (!available)
|
| - {
|
| - LOG(LS_WARNING) << "it is not possible to enable microphone boost";
|
| - return -1;
|
| - }
|
| -
|
| - // It is assumed that the call above fails!
|
| -
|
| - return (0);
|
| -}
|
| -
|
| -int32_t AudioMixerManagerLinuxALSA::MicrophoneBoost(bool& enabled) const
|
| -{
|
| -
|
| - if (_inputMixerHandle == NULL)
|
| - {
|
| - LOG(LS_WARNING) << "no avaliable input mixer exists";
|
| - return -1;
|
| - }
|
| -
|
| - // Microphone boost cannot be enabled on this platform!
|
| - enabled = false;
|
| -
|
| - return 0;
|
| -}
|
| -
|
| int32_t AudioMixerManagerLinuxALSA::MicrophoneVolumeIsAvailable(
|
| bool& available)
|
| {
|
| @@ -1027,22 +954,6 @@ int32_t AudioMixerManagerLinuxALSA::MinMicrophoneVolume(
|
| return 0;
|
| }
|
|
|
| -int32_t AudioMixerManagerLinuxALSA::MicrophoneVolumeStepSize(
|
| - uint16_t& stepSize) const
|
| -{
|
| -
|
| - if (_inputMixerHandle == NULL)
|
| - {
|
| - LOG(LS_WARNING) << "no avaliable input mixer exists";
|
| - return -1;
|
| - }
|
| -
|
| - // The step size is always 1 for ALSA
|
| - stepSize = 1;
|
| -
|
| - return 0;
|
| -}
|
| -
|
| // ============================================================================
|
| // Private Methods
|
| // ============================================================================
|
|
|