Chromium Code Reviews| Index: webrtc/modules/audio_device/audio_device_generic.cc |
| diff --git a/webrtc/modules/audio_device/audio_device_generic.cc b/webrtc/modules/audio_device/audio_device_generic.cc |
| index 958abbf4d2c2b51a2afe13dd32fde840eafe955b..6e3848760774bf617526c8a866549ff31b0b4142 100644 |
| --- a/webrtc/modules/audio_device/audio_device_generic.cc |
| +++ b/webrtc/modules/audio_device/audio_device_generic.cc |
| @@ -14,68 +14,70 @@ |
| namespace webrtc { |
| int32_t AudioDeviceGeneric::SetRecordingSampleRate( |
| - const uint32_t samplesPerSec) |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Set recording sample rate not supported on this platform"); |
| - return -1; |
| + const uint32_t samplesPerSec) { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
|
tkchin_webrtc
2015/07/06 03:46:28
These traces were removed in the other file, did y
henrika_webrtc
2015/07/07 16:01:38
Let me fix it ;-)
|
| + "Set recording sample rate not supported on this platform"); |
| + return -1; |
| } |
| -int32_t AudioDeviceGeneric::SetPlayoutSampleRate( |
| - const uint32_t samplesPerSec) |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Set playout sample rate not supported on this platform"); |
| - return -1; |
| +int32_t AudioDeviceGeneric::SetPlayoutSampleRate(const uint32_t samplesPerSec) { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Set playout sample rate not supported on this platform"); |
| + return -1; |
| } |
| -int32_t AudioDeviceGeneric::SetLoudspeakerStatus(bool enable) |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Set loudspeaker status not supported on this platform"); |
| - return -1; |
| +int32_t AudioDeviceGeneric::SetLoudspeakerStatus(bool enable) { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Set loudspeaker status not supported on this platform"); |
| + return -1; |
| } |
| -int32_t AudioDeviceGeneric::GetLoudspeakerStatus(bool& enable) const |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Get loudspeaker status not supported on this platform"); |
| - return -1; |
| +int32_t AudioDeviceGeneric::GetLoudspeakerStatus(bool& enable) const { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Get loudspeaker status not supported on this platform"); |
| + return -1; |
| } |
| -int32_t AudioDeviceGeneric::ResetAudioDevice() |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Reset audio device not supported on this platform"); |
| - return -1; |
| +int32_t AudioDeviceGeneric::ResetAudioDevice() { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Reset audio device not supported on this platform"); |
| + return -1; |
| } |
| int32_t AudioDeviceGeneric::SoundDeviceControl(unsigned int par1, |
| - unsigned int par2, unsigned int par3, unsigned int par4) |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Sound device control not supported on this platform"); |
| - return -1; |
| + unsigned int par2, |
| + unsigned int par3, |
| + unsigned int par4) { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Sound device control not supported on this platform"); |
| + return -1; |
| } |
| bool AudioDeviceGeneric::BuiltInAECIsAvailable() const { |
| WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Built-in AEC not supported on this platform"); |
| + "Built-in AEC not supported on this platform"); |
| return false; |
| } |
| -int32_t AudioDeviceGeneric::EnableBuiltInAEC(bool enable) |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Built-in AEC not supported on this platform"); |
| - return -1; |
| +int32_t AudioDeviceGeneric::EnableBuiltInAEC(bool enable) { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Built-in AEC not supported on this platform"); |
| + return -1; |
| +} |
| + |
| +bool AudioDeviceGeneric::BuiltInAECIsEnabled() const { |
| + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| + "Windows AEC not supported on this platform"); |
| + return false; |
| } |
| -bool AudioDeviceGeneric::BuiltInAECIsEnabled() const |
| -{ |
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, |
| - "Windows AEC not supported on this platform"); |
| - return false; |
| +int AudioDeviceGeneric::GetPlayoutAudioParameters( |
| + AudioParameters* params) const { |
| + return -1; |
| +} |
| +int AudioDeviceGeneric::GetRecordAudioParameters( |
| + AudioParameters* params) const { |
| + return -1; |
| } |
| } // namespace webrtc |