Index: webrtc/modules/audio_device/linux/audio_device_alsa_linux.h |
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h |
index f7fb9a90adbe9f72aa57982fc01c1e993c4e0c5d..264846544cf656345465edcce296ef186748da4b 100644 |
--- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h |
+++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h |
@@ -95,7 +95,6 @@ public: |
int32_t SpeakerVolume(uint32_t& volume) const override; |
int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override; |
int32_t MinSpeakerVolume(uint32_t& minVolume) const override; |
- int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const override; |
// Microphone volume controls |
int32_t MicrophoneVolumeIsAvailable(bool& available) override; |
@@ -103,7 +102,6 @@ public: |
int32_t MicrophoneVolume(uint32_t& volume) const override; |
int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const override; |
int32_t MinMicrophoneVolume(uint32_t& minVolume) const override; |
- int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const override; |
// Speaker mute control |
int32_t SpeakerMuteIsAvailable(bool& available) override; |
@@ -115,11 +113,6 @@ public: |
int32_t SetMicrophoneMute(bool enable) override; |
int32_t MicrophoneMute(bool& enabled) const override; |
- // Microphone boost control |
- int32_t MicrophoneBoostIsAvailable(bool& available) override; |
- int32_t SetMicrophoneBoost(bool enable) override; |
- int32_t MicrophoneBoost(bool& enabled) const override; |
- |
// Stereo support |
int32_t StereoPlayoutIsAvailable(bool& available) override; |
int32_t SetStereoPlayout(bool enable) override; |
@@ -129,26 +122,19 @@ public: |
int32_t StereoRecording(bool& enabled) const override; |
// Delay information and control |
- int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type, |
- uint16_t sizeMS) override; |
- int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type, |
- uint16_t& sizeMS) const override; |
int32_t PlayoutDelay(uint16_t& delayMS) const override; |
int32_t RecordingDelay(uint16_t& delayMS) const override; |
- // CPU load |
- int32_t CPULoad(uint16_t& load) const override; |
- |
- bool PlayoutWarning() const override; |
- bool PlayoutError() const override; |
- bool RecordingWarning() const override; |
- bool RecordingError() const override; |
- void ClearPlayoutWarning() override; |
- void ClearPlayoutError() override; |
- void ClearRecordingWarning() override; |
- void ClearRecordingError() override; |
+ bool PlayoutWarning() const override; |
+ bool PlayoutError() const override; |
+ bool RecordingWarning() const override; |
+ bool RecordingError() const override; |
+ void ClearPlayoutWarning() override; |
+ void ClearPlayoutError() override; |
+ void ClearRecordingWarning() override; |
+ void ClearRecordingError() override; |
- void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override; |
+ void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override; |
private: |
int32_t GetDevicesInfo(const int32_t function, |
@@ -210,8 +196,6 @@ private: |
uint32_t _recordingFramesLeft; |
uint32_t _playoutFramesLeft; |
- AudioDeviceModule::BufferType _playBufType; |
- |
bool _initialized; |
bool _recording; |
bool _playing; |
@@ -227,9 +211,6 @@ private: |
uint16_t _recWarning; |
uint16_t _recError; |
- uint16_t _playBufDelay; // playback delay |
- uint16_t _playBufDelayFixed; // fixed playback delay |
- |
char _oldKeyState[32]; |
#if defined(USE_X11) |
Display* _XDisplay; |