Removes unused APIs from the ADM (part II)

webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 64 matching lines @@
     _recordingFramesIn10MS(0),
     _playoutFramesIn10MS(0),
     _recordingFreq(ALSA_CAPTURE_FREQ),
     _playoutFreq(ALSA_PLAYOUT_FREQ),
     _recChannels(ALSA_CAPTURE_CH),
     _playChannels(ALSA_PLAYOUT_CH),
     _recordingBuffer(NULL),
     _playoutBuffer(NULL),
     _recordingFramesLeft(0),
     _playoutFramesLeft(0),
-    _playBufType(AudioDeviceModule::kFixedBufferSize),
     _initialized(false),
     _recording(false),
     _playing(false),
     _recIsInitialized(false),
     _playIsInitialized(false),
     _AGC(false),
     _recordingDelay(0),
     _playoutDelay(0),
     _playWarning(0),
     _playError(0),
     _recWarning(0),
-    _recError(0),
-    _playBufDelay(80),
-    _playBufDelayFixed(80)
+    _recError(0)
 {
     memset(_oldKeyState, 0, sizeof(_oldKeyState));
     LOG(LS_INFO) << __FUNCTION__ << " created";
 }
 
 // ----------------------------------------------------------------------------
 //  AudioDeviceLinuxALSA - dtor
 // ----------------------------------------------------------------------------
 
 AudioDeviceLinuxALSA::~AudioDeviceLinuxALSA()
@@ skipping 236 matching lines @@
     if (_mixerManager.MinSpeakerVolume(minVol) == -1)
     {
         return -1;
     }
 
     minVolume = minVol;
 
     return 0;
 }
 
-int32_t AudioDeviceLinuxALSA::SpeakerVolumeStepSize(
-    uint16_t& stepSize) const
-{
-
-    uint16_t delta(0);
-
-    if (_mixerManager.SpeakerVolumeStepSize(delta) == -1)
-    {
-        return -1;
-    }
-
-    stepSize = delta;
-
-    return 0;
-}
-
 int32_t AudioDeviceLinuxALSA::SpeakerMuteIsAvailable(bool& available)
 {
 
     bool isAvailable(false);
     bool wasInitialized = _mixerManager.SpeakerIsInitialized();
 
     // Make an attempt to open up the
     // output mixer corresponding to the currently selected output device.
     //
     if (!wasInitialized && InitSpeaker() == -1)
@@ skipping 88 matching lines @@
 
     if (_mixerManager.MicrophoneMute(muted) == -1)
     {
         return -1;
     }
 
     enabled = muted;
     return 0;
 }
 
-int32_t AudioDeviceLinuxALSA::MicrophoneBoostIsAvailable(bool& available)
-{
-
-    bool isAvailable(false);
-    bool wasInitialized = _mixerManager.MicrophoneIsInitialized();
-
-    // Enumerate all avaliable microphone and make an attempt to open up the
-    // input mixer corresponding to the currently selected input device.
-    //
-    if (!wasInitialized && InitMicrophone() == -1)
-    {
-        // If we end up here it means that the selected microphone has no volume
-        // control, hence it is safe to state that there is no boost control
-        // already at this stage.
-        available = false;
-        return 0;
-    }
-
-    // Check if the selected microphone has a boost control
-    _mixerManager.MicrophoneBoostIsAvailable(isAvailable);
-    available = isAvailable;
-
-    // Close the initialized input mixer
-    if (!wasInitialized)
-    {
-        _mixerManager.CloseMicrophone();
-    }
-
-    return 0;
-}
-
-int32_t AudioDeviceLinuxALSA::SetMicrophoneBoost(bool enable)
-{
-
-    return (_mixerManager.SetMicrophoneBoost(enable));
-}
-
-int32_t AudioDeviceLinuxALSA::MicrophoneBoost(bool& enabled) const
-{
-
-    bool onOff(0);
-
-    if (_mixerManager.MicrophoneBoost(onOff) == -1)
-    {
-        return -1;
-    }
-
-    enabled = onOff;
-
-    return 0;
-}
-
 int32_t AudioDeviceLinuxALSA::StereoRecordingIsAvailable(bool& available)
 {
 
     rtc::CritScope lock(&_critSect);
 
     // If we already have initialized in stereo it's obviously available
     if (_recIsInitialized && (2 == _recChannels))
     {
         available = true;
         return 0;
@@ skipping 220 matching lines @@
     if (_mixerManager.MinMicrophoneVolume(minVol) == -1)
     {
         return -1;
     }
 
     minVolume = minVol;
 
     return 0;
 }
 
-int32_t AudioDeviceLinuxALSA::MicrophoneVolumeStepSize(
-    uint16_t& stepSize) const
-{
-
-    uint16_t delta(0);
-
-    if (_mixerManager.MicrophoneVolumeStepSize(delta) == -1)
-    {
-        return -1;
-    }
-
-    stepSize = delta;
-
-    return 0;
-}
-
 int16_t AudioDeviceLinuxALSA::PlayoutDevices()
 {
 
     return (int16_t)GetDevicesInfo(0, true);
 }
 
 int32_t AudioDeviceLinuxALSA::SetPlayoutDevice(uint16_t index)
 {
 
     if (_playIsInitialized)
@@ skipping 728 matching lines @@
 {
     // Adding 10ms adjusted value to the record delay due to 10ms buffering.
     delayMS = (uint16_t)(10 + _recordingDelay * 1000 / _recordingFreq);
     return 0;
 }
 
 bool AudioDeviceLinuxALSA::Playing() const
 {
     return (_playing);
 }
-// ----------------------------------------------------------------------------
-//  SetPlayoutBuffer
-// ----------------------------------------------------------------------------
-
-int32_t AudioDeviceLinuxALSA::SetPlayoutBuffer(
-    const AudioDeviceModule::BufferType type,
-    uint16_t sizeMS)
-{
-    _playBufType = type;
-    if (type == AudioDeviceModule::kFixedBufferSize)
-    {
-        _playBufDelayFixed = sizeMS;
-    }
-    return 0;
-}
-
-int32_t AudioDeviceLinuxALSA::PlayoutBuffer(
-    AudioDeviceModule::BufferType& type,
-    uint16_t& sizeMS) const
-{
-    type = _playBufType;
-    if (type == AudioDeviceModule::kFixedBufferSize)
-    {
-        sizeMS = _playBufDelayFixed;
-    }
-    else
-    {
-        sizeMS = _playBufDelay;
-    }
-
-    return 0;
-}
-
-int32_t AudioDeviceLinuxALSA::CPULoad(uint16_t& load) const
-{
-
-    LOG(LS_WARNING) << "API call not supported on this platform";
-    return -1;
-}
 
 bool AudioDeviceLinuxALSA::PlayoutWarning() const
 {
     rtc::CritScope lock(&_critSect);
     return (_playWarning > 0);
 }
 
 bool AudioDeviceLinuxALSA::PlayoutError() const
 {
     rtc::CritScope lock(&_critSect);
@@ skipping 550 matching lines @@
     state |= (szKey[i] ^ _oldKeyState[i]) & szKey[i];
 
   // Save old state
   memcpy((char*)_oldKeyState, (char*)szKey, sizeof(_oldKeyState));
   return (state != 0);
 #else
   return false;
 #endif
 }
 }  // namespace webrtc