Index: webrtc/modules/audio_device/audio_device_generic.h |
diff --git a/webrtc/modules/audio_device/audio_device_generic.h b/webrtc/modules/audio_device/audio_device_generic.h |
index ca313273eadd6a4499c40aab863654943fd0c920..cdcb9347784241b35924020e74d9885a9835fdd8 100644 |
--- a/webrtc/modules/audio_device/audio_device_generic.h |
+++ b/webrtc/modules/audio_device/audio_device_generic.h |
@@ -87,7 +87,6 @@ class AudioDeviceGeneric { |
virtual int32_t SpeakerVolume(uint32_t& volume) const = 0; |
virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const = 0; |
virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const = 0; |
- virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const = 0; |
// Microphone volume controls |
virtual int32_t MicrophoneVolumeIsAvailable(bool& available) = 0; |
@@ -95,7 +94,6 @@ class AudioDeviceGeneric { |
virtual int32_t MicrophoneVolume(uint32_t& volume) const = 0; |
virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const = 0; |
virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const = 0; |
- virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const = 0; |
// Speaker mute control |
virtual int32_t SpeakerMuteIsAvailable(bool& available) = 0; |
@@ -107,11 +105,6 @@ class AudioDeviceGeneric { |
virtual int32_t SetMicrophoneMute(bool enable) = 0; |
virtual int32_t MicrophoneMute(bool& enabled) const = 0; |
- // Microphone boost control |
- virtual int32_t MicrophoneBoostIsAvailable(bool& available) = 0; |
- virtual int32_t SetMicrophoneBoost(bool enable) = 0; |
- virtual int32_t MicrophoneBoost(bool& enabled) const = 0; |
- |
// Stereo support |
virtual int32_t StereoPlayoutIsAvailable(bool& available) = 0; |
virtual int32_t SetStereoPlayout(bool enable) = 0; |
@@ -121,16 +114,9 @@ class AudioDeviceGeneric { |
virtual int32_t StereoRecording(bool& enabled) const = 0; |
// Delay information and control |
- virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type, |
- uint16_t sizeMS = 0) = 0; |
- virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type, |
- uint16_t& sizeMS) const = 0; |
virtual int32_t PlayoutDelay(uint16_t& delayMS) const = 0; |
virtual int32_t RecordingDelay(uint16_t& delayMS) const = 0; |
- // CPU load |
- virtual int32_t CPULoad(uint16_t& load) const = 0; |
- |
// Native sample rate controls (samples/sec) |
virtual int32_t SetRecordingSampleRate(const uint32_t samplesPerSec); |
virtual int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec); |
@@ -139,15 +125,6 @@ class AudioDeviceGeneric { |
virtual int32_t SetLoudspeakerStatus(bool enable); |
virtual int32_t GetLoudspeakerStatus(bool& enable) const; |
- // Reset Audio Device (for mobile devices) |
- virtual int32_t ResetAudioDevice(); |
- |
- // Sound Audio Device control (for WinCE only) |
- virtual int32_t SoundDeviceControl(unsigned int par1 = 0, |
- unsigned int par2 = 0, |
- unsigned int par3 = 0, |
- unsigned int par4 = 0); |
- |
// Android only |
virtual bool BuiltInAECIsAvailable() const; |
virtual bool BuiltInAGCIsAvailable() const; |