Fix some chromium-style warnings in webrtc/modules/audio_device/
BUG=163
R=xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1897005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4426 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_device/audio_device.gypi b/modules/audio_device/audio_device.gypi
index 54b36d4..a2463f6 100644
--- a/modules/audio_device/audio_device.gypi
+++ b/modules/audio_device/audio_device.gypi
@@ -40,7 +40,9 @@
'audio_device_impl.cc',
'audio_device_impl.h',
'audio_device_config.h',
+ 'dummy/audio_device_dummy.cc',
'dummy/audio_device_dummy.h',
+ 'dummy/audio_device_utility_dummy.cc',
'dummy/audio_device_utility_dummy.h',
],
'conditions': [
diff --git a/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h
index d34543b..26bd543 100644
--- a/modules/audio_device/audio_device_impl.h
+++ b/modules/audio_device/audio_device_impl.h
@@ -43,9 +43,9 @@
virtual ~AudioDeviceModuleImpl();
public: // RefCountedModule
- virtual int32_t ChangeUniqueId(const int32_t id);
- virtual int32_t TimeUntilNextProcess();
- virtual int32_t Process();
+ virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
+ virtual int32_t TimeUntilNextProcess() OVERRIDE;
+ virtual int32_t Process() OVERRIDE;
public:
// Factory methods (resource allocation/deallocation)
@@ -54,154 +54,155 @@
const AudioLayer audioLayer = kPlatformDefaultAudio);
// Retrieve the currently utilized audio layer
- virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const;
+ virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const OVERRIDE;
// Error handling
- virtual ErrorCode LastError() const;
+ virtual ErrorCode LastError() const OVERRIDE;
virtual int32_t RegisterEventObserver(
- AudioDeviceObserver* eventCallback);
+ AudioDeviceObserver* eventCallback) OVERRIDE;
// Full-duplex transportation of PCM audio
virtual int32_t RegisterAudioCallback(
- AudioTransport* audioCallback);
+ AudioTransport* audioCallback) OVERRIDE;
// Main initializaton and termination
- virtual int32_t Init();
- virtual int32_t Terminate();
- virtual bool Initialized() const;
+ virtual int32_t Init() OVERRIDE;
+ virtual int32_t Terminate() OVERRIDE;
+ virtual bool Initialized() const OVERRIDE;
// Device enumeration
- virtual int16_t PlayoutDevices();
- virtual int16_t RecordingDevices();
+ virtual int16_t PlayoutDevices() OVERRIDE;
+ virtual int16_t RecordingDevices() OVERRIDE;
virtual int32_t PlayoutDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
virtual int32_t RecordingDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
// Device selection
- virtual int32_t SetPlayoutDevice(uint16_t index);
- virtual int32_t SetPlayoutDevice(WindowsDeviceType device);
- virtual int32_t SetRecordingDevice(uint16_t index);
- virtual int32_t SetRecordingDevice(WindowsDeviceType device);
+ virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
+ virtual int32_t SetPlayoutDevice(WindowsDeviceType device) OVERRIDE;
+ virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
+ virtual int32_t SetRecordingDevice(WindowsDeviceType device) OVERRIDE;
// Audio transport initialization
- virtual int32_t PlayoutIsAvailable(bool* available);
- virtual int32_t InitPlayout();
- virtual bool PlayoutIsInitialized() const;
- virtual int32_t RecordingIsAvailable(bool* available);
- virtual int32_t InitRecording();
- virtual bool RecordingIsInitialized() const;
+ virtual int32_t PlayoutIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t InitPlayout() OVERRIDE;
+ virtual bool PlayoutIsInitialized() const OVERRIDE;
+ virtual int32_t RecordingIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t InitRecording() OVERRIDE;
+ virtual bool RecordingIsInitialized() const OVERRIDE;
// Audio transport control
- virtual int32_t StartPlayout();
- virtual int32_t StopPlayout();
- virtual bool Playing() const;
- virtual int32_t StartRecording();
- virtual int32_t StopRecording();
- virtual bool Recording() const;
+ virtual int32_t StartPlayout() OVERRIDE;
+ virtual int32_t StopPlayout() OVERRIDE;
+ virtual bool Playing() const OVERRIDE;
+ virtual int32_t StartRecording() OVERRIDE;
+ virtual int32_t StopRecording() OVERRIDE;
+ virtual bool Recording() const OVERRIDE;
// Microphone Automatic Gain Control (AGC)
- virtual int32_t SetAGC(bool enable);
- virtual bool AGC() const;
+ virtual int32_t SetAGC(bool enable) OVERRIDE;
+ virtual bool AGC() const OVERRIDE;
// Volume control based on the Windows Wave API (Windows only)
- virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
+ virtual int32_t SetWaveOutVolume(uint16_t volumeLeft,
+ uint16_t volumeRight) OVERRIDE;
virtual int32_t WaveOutVolume(uint16_t* volumeLeft,
- uint16_t* volumeRight) const;
+ uint16_t* volumeRight) const OVERRIDE;
// Audio mixer initialization
- virtual int32_t SpeakerIsAvailable(bool* available);
- virtual int32_t InitSpeaker();
- virtual bool SpeakerIsInitialized() const;
- virtual int32_t MicrophoneIsAvailable(bool* available);
- virtual int32_t InitMicrophone();
- virtual bool MicrophoneIsInitialized() const;
+ virtual int32_t SpeakerIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t InitSpeaker() OVERRIDE;
+ virtual bool SpeakerIsInitialized() const OVERRIDE;
+ virtual int32_t MicrophoneIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t InitMicrophone() OVERRIDE;
+ virtual bool MicrophoneIsInitialized() const OVERRIDE;
// Speaker volume controls
- virtual int32_t SpeakerVolumeIsAvailable(bool* available);
- virtual int32_t SetSpeakerVolume(uint32_t volume);
- virtual int32_t SpeakerVolume(uint32_t* volume) const;
- virtual int32_t MaxSpeakerVolume(uint32_t* maxVolume) const;
- virtual int32_t MinSpeakerVolume(uint32_t* minVolume) const;
+ virtual int32_t SpeakerVolumeIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t SpeakerVolume(uint32_t* volume) const OVERRIDE;
+ virtual int32_t MaxSpeakerVolume(uint32_t* maxVolume) const OVERRIDE;
+ virtual int32_t MinSpeakerVolume(uint32_t* minVolume) const OVERRIDE;
virtual int32_t SpeakerVolumeStepSize(
- uint16_t* stepSize) const;
+ uint16_t* stepSize) const OVERRIDE;
// Microphone volume controls
- virtual int32_t MicrophoneVolumeIsAvailable(bool* available);
- virtual int32_t SetMicrophoneVolume(uint32_t volume);
- virtual int32_t MicrophoneVolume(uint32_t* volume) const;
+ virtual int32_t MicrophoneVolumeIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t MicrophoneVolume(uint32_t* volume) const OVERRIDE;
virtual int32_t MaxMicrophoneVolume(
- uint32_t* maxVolume) const;
+ uint32_t* maxVolume) const OVERRIDE;
virtual int32_t MinMicrophoneVolume(
- uint32_t* minVolume) const;
+ uint32_t* minVolume) const OVERRIDE;
virtual int32_t MicrophoneVolumeStepSize(
- uint16_t* stepSize) const;
+ uint16_t* stepSize) const OVERRIDE;
// Speaker mute control
- virtual int32_t SpeakerMuteIsAvailable(bool* available);
- virtual int32_t SetSpeakerMute(bool enable);
- virtual int32_t SpeakerMute(bool* enabled) const;
+ virtual int32_t SpeakerMuteIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
+ virtual int32_t SpeakerMute(bool* enabled) const OVERRIDE;
// Microphone mute control
- virtual int32_t MicrophoneMuteIsAvailable(bool* available);
- virtual int32_t SetMicrophoneMute(bool enable);
- virtual int32_t MicrophoneMute(bool* enabled) const;
+ virtual int32_t MicrophoneMuteIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneMute(bool* enabled) const OVERRIDE;
// Microphone boost control
- virtual int32_t MicrophoneBoostIsAvailable(bool* available);
- virtual int32_t SetMicrophoneBoost(bool enable);
- virtual int32_t MicrophoneBoost(bool* enabled) const;
+ virtual int32_t MicrophoneBoostIsAvailable(bool* available) OVERRIDE;
+ virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneBoost(bool* enabled) const OVERRIDE;
// Stereo support
- virtual int32_t StereoPlayoutIsAvailable(bool* available) const;
- virtual int32_t SetStereoPlayout(bool enable);
- virtual int32_t StereoPlayout(bool* enabled) const;
- virtual int32_t StereoRecordingIsAvailable(bool* available) const;
- virtual int32_t SetStereoRecording(bool enable);
- virtual int32_t StereoRecording(bool* enabled) const;
- virtual int32_t SetRecordingChannel(const ChannelType channel);
- virtual int32_t RecordingChannel(ChannelType* channel) const;
+ virtual int32_t StereoPlayoutIsAvailable(bool* available) const OVERRIDE;
+ virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
+ virtual int32_t StereoPlayout(bool* enabled) const OVERRIDE;
+ virtual int32_t StereoRecordingIsAvailable(bool* available) const OVERRIDE;
+ virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
+ virtual int32_t StereoRecording(bool* enabled) const OVERRIDE;
+ virtual int32_t SetRecordingChannel(const ChannelType channel) OVERRIDE;
+ virtual int32_t RecordingChannel(ChannelType* channel) const OVERRIDE;
// Delay information and control
virtual int32_t SetPlayoutBuffer(const BufferType type,
- uint16_t sizeMS = 0);
+ uint16_t sizeMS = 0) OVERRIDE;
virtual int32_t PlayoutBuffer(BufferType* type,
- uint16_t* sizeMS) const;
- virtual int32_t PlayoutDelay(uint16_t* delayMS) const;
- virtual int32_t RecordingDelay(uint16_t* delayMS) const;
+ uint16_t* sizeMS) const OVERRIDE;
+ virtual int32_t PlayoutDelay(uint16_t* delayMS) const OVERRIDE;
+ virtual int32_t RecordingDelay(uint16_t* delayMS) const OVERRIDE;
// CPU load
- virtual int32_t CPULoad(uint16_t* load) const;
+ virtual int32_t CPULoad(uint16_t* load) const OVERRIDE;
// Recording of raw PCM data
virtual int32_t StartRawOutputFileRecording(
- const char pcmFileNameUTF8[kAdmMaxFileNameSize]);
- virtual int32_t StopRawOutputFileRecording();
+ const char pcmFileNameUTF8[kAdmMaxFileNameSize]) OVERRIDE;
+ virtual int32_t StopRawOutputFileRecording() OVERRIDE;
virtual int32_t StartRawInputFileRecording(
- const char pcmFileNameUTF8[kAdmMaxFileNameSize]);
- virtual int32_t StopRawInputFileRecording();
+ const char pcmFileNameUTF8[kAdmMaxFileNameSize]) OVERRIDE;
+ virtual int32_t StopRawInputFileRecording() OVERRIDE;
// Native sample rate controls (samples/sec)
virtual int32_t SetRecordingSampleRate(
- const uint32_t samplesPerSec);
+ const uint32_t samplesPerSec) OVERRIDE;
virtual int32_t RecordingSampleRate(
- uint32_t* samplesPerSec) const;
+ uint32_t* samplesPerSec) const OVERRIDE;
virtual int32_t SetPlayoutSampleRate(
- const uint32_t samplesPerSec);
+ const uint32_t samplesPerSec) OVERRIDE;
virtual int32_t PlayoutSampleRate(
- uint32_t* samplesPerSec) const;
+ uint32_t* samplesPerSec) const OVERRIDE;
// Mobile device specific functions
- virtual int32_t ResetAudioDevice();
- virtual int32_t SetLoudspeakerStatus(bool enable);
- virtual int32_t GetLoudspeakerStatus(bool* enabled) const;
+ virtual int32_t ResetAudioDevice() OVERRIDE;
+ virtual int32_t SetLoudspeakerStatus(bool enable) OVERRIDE;
+ virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE;
- virtual int32_t EnableBuiltInAEC(bool enable);
- virtual bool BuiltInAECIsEnabled() const;
+ virtual int32_t EnableBuiltInAEC(bool enable) OVERRIDE;
+ virtual bool BuiltInAECIsEnabled() const OVERRIDE;
public:
int32_t Id() {return _id;}
diff --git a/modules/audio_device/dummy/audio_device_dummy.cc b/modules/audio_device/dummy/audio_device_dummy.cc
new file mode 100644
index 0000000..379b257
--- /dev/null
+++ b/modules/audio_device/dummy/audio_device_dummy.cc
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2013 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.
+ */
+
+#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h"
+
+namespace webrtc {
+
+int32_t AudioDeviceDummy::ActiveAudioLayer(
+ AudioDeviceModule::AudioLayer& audioLayer) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::Init() { return 0; }
+
+int32_t AudioDeviceDummy::Terminate() { return 0; }
+
+bool AudioDeviceDummy::Initialized() const { return true; }
+
+int16_t AudioDeviceDummy::PlayoutDevices() { return -1; }
+
+int16_t AudioDeviceDummy::RecordingDevices() { return -1; }
+
+int32_t AudioDeviceDummy::PlayoutDeviceName(uint16_t index,
+ char name[kAdmMaxDeviceNameSize],
+ char guid[kAdmMaxGuidSize]) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::RecordingDeviceName(uint16_t index,
+ char name[kAdmMaxDeviceNameSize],
+ char guid[kAdmMaxGuidSize]) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetPlayoutDevice(uint16_t index) { return -1; }
+
+int32_t AudioDeviceDummy::SetPlayoutDevice(
+ AudioDeviceModule::WindowsDeviceType device) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetRecordingDevice(uint16_t index) { return -1; }
+
+int32_t AudioDeviceDummy::SetRecordingDevice(
+ AudioDeviceModule::WindowsDeviceType device) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::PlayoutIsAvailable(bool& available) { return -1; }
+
+int32_t AudioDeviceDummy::InitPlayout() { return -1; }
+
+bool AudioDeviceDummy::PlayoutIsInitialized() const { return false; }
+
+int32_t AudioDeviceDummy::RecordingIsAvailable(bool& available) { return -1; }
+
+int32_t AudioDeviceDummy::InitRecording() { return -1; }
+
+bool AudioDeviceDummy::RecordingIsInitialized() const { return false; }
+
+int32_t AudioDeviceDummy::StartPlayout() { return -1; }
+
+int32_t AudioDeviceDummy::StopPlayout() { return -1; }
+
+bool AudioDeviceDummy::Playing() const { return false; }
+
+int32_t AudioDeviceDummy::StartRecording() { return -1; }
+
+int32_t AudioDeviceDummy::StopRecording() { return -1; }
+
+bool AudioDeviceDummy::Recording() const { return false; }
+
+int32_t AudioDeviceDummy::SetAGC(bool enable) { return -1; }
+
+bool AudioDeviceDummy::AGC() const { return false; }
+
+int32_t AudioDeviceDummy::SetWaveOutVolume(uint16_t volumeLeft,
+ uint16_t volumeRight) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::WaveOutVolume(uint16_t& volumeLeft,
+ uint16_t& volumeRight) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SpeakerIsAvailable(bool& available) { return -1; }
+
+int32_t AudioDeviceDummy::InitSpeaker() { return -1; }
+
+bool AudioDeviceDummy::SpeakerIsInitialized() const { return false; }
+
+int32_t AudioDeviceDummy::MicrophoneIsAvailable(bool& available) { return -1; }
+
+int32_t AudioDeviceDummy::InitMicrophone() { return -1; }
+
+bool AudioDeviceDummy::MicrophoneIsInitialized() const { return false; }
+
+int32_t AudioDeviceDummy::SpeakerVolumeIsAvailable(bool& available) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetSpeakerVolume(uint32_t volume) { return -1; }
+
+int32_t AudioDeviceDummy::SpeakerVolume(uint32_t& volume) const { return -1; }
+
+int32_t AudioDeviceDummy::MaxSpeakerVolume(uint32_t& maxVolume) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::MinSpeakerVolume(uint32_t& minVolume) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SpeakerVolumeStepSize(uint16_t& stepSize) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::MicrophoneVolumeIsAvailable(bool& available) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetMicrophoneVolume(uint32_t volume) { return -1; }
+
+int32_t AudioDeviceDummy::MicrophoneVolume(uint32_t& volume) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::MaxMicrophoneVolume(uint32_t& maxVolume) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::MinMicrophoneVolume(uint32_t& minVolume) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::MicrophoneVolumeStepSize(uint16_t& stepSize) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SpeakerMuteIsAvailable(bool& available) { return -1; }
+
+int32_t AudioDeviceDummy::SetSpeakerMute(bool enable) { return -1; }
+
+int32_t AudioDeviceDummy::SpeakerMute(bool& enabled) const { return -1; }
+
+int32_t AudioDeviceDummy::MicrophoneMuteIsAvailable(bool& available) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetMicrophoneMute(bool enable) { return -1; }
+
+int32_t AudioDeviceDummy::MicrophoneMute(bool& enabled) const { return -1; }
+
+int32_t AudioDeviceDummy::MicrophoneBoostIsAvailable(bool& available) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetMicrophoneBoost(bool enable) { return -1; }
+
+int32_t AudioDeviceDummy::MicrophoneBoost(bool& enabled) const { return -1; }
+
+int32_t AudioDeviceDummy::StereoPlayoutIsAvailable(bool& available) {
+ return -1;
+}
+int32_t AudioDeviceDummy::SetStereoPlayout(bool enable) { return -1; }
+
+int32_t AudioDeviceDummy::StereoPlayout(bool& enabled) const { return -1; }
+
+int32_t AudioDeviceDummy::StereoRecordingIsAvailable(bool& available) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::SetStereoRecording(bool enable) { return -1; }
+
+int32_t AudioDeviceDummy::StereoRecording(bool& enabled) const { return -1; }
+
+int32_t AudioDeviceDummy::SetPlayoutBuffer(
+ const AudioDeviceModule::BufferType type,
+ uint16_t sizeMS) {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::PlayoutBuffer(AudioDeviceModule::BufferType& type,
+ uint16_t& sizeMS) const {
+ return -1;
+}
+
+int32_t AudioDeviceDummy::PlayoutDelay(uint16_t& delayMS) const { return -1; }
+
+int32_t AudioDeviceDummy::RecordingDelay(uint16_t& delayMS) const { return -1; }
+
+int32_t AudioDeviceDummy::CPULoad(uint16_t& load) const { return -1; }
+
+bool AudioDeviceDummy::PlayoutWarning() const { return false; }
+
+bool AudioDeviceDummy::PlayoutError() const { return false; }
+
+bool AudioDeviceDummy::RecordingWarning() const { return false; }
+
+bool AudioDeviceDummy::RecordingError() const { return false; }
+
+void AudioDeviceDummy::ClearPlayoutWarning() {}
+
+void AudioDeviceDummy::ClearPlayoutError() {}
+
+void AudioDeviceDummy::ClearRecordingWarning() {}
+
+void AudioDeviceDummy::ClearRecordingError() {}
+
+void AudioDeviceDummy::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) {}
+} // namespace webrtc
diff --git a/modules/audio_device/dummy/audio_device_dummy.h b/modules/audio_device/dummy/audio_device_dummy.h
index 78baa2e..47d7aab 100644
--- a/modules/audio_device/dummy/audio_device_dummy.h
+++ b/modules/audio_device/dummy/audio_device_dummy.h
@@ -17,172 +17,132 @@
namespace webrtc {
-class AudioDeviceDummy : public AudioDeviceGeneric
-{
-public:
- AudioDeviceDummy(const int32_t id) {}
- ~AudioDeviceDummy() {}
+class AudioDeviceDummy : public AudioDeviceGeneric {
+ public:
+ AudioDeviceDummy(const int32_t id) {}
+ virtual ~AudioDeviceDummy() {}
- // Retrieve the currently utilized audio layer
- virtual int32_t ActiveAudioLayer(
- AudioDeviceModule::AudioLayer& audioLayer) const { return -1; }
+ // Retrieve the currently utilized audio layer
+ virtual int32_t ActiveAudioLayer(
+ AudioDeviceModule::AudioLayer& audioLayer) const OVERRIDE;
- // Main initializaton and termination
- virtual int32_t Init() { return 0; }
- virtual int32_t Terminate() { return 0; }
- virtual bool Initialized() const { return true; }
+ // Main initializaton and termination
+ virtual int32_t Init() OVERRIDE;
+ virtual int32_t Terminate() OVERRIDE;
+ virtual bool Initialized() const OVERRIDE;
- // Device enumeration
- virtual int16_t PlayoutDevices() { return -1; }
- virtual int16_t RecordingDevices() { return -1; }
- virtual int32_t PlayoutDeviceName(
- uint16_t index,
- char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]) { return -1; }
- virtual int32_t RecordingDeviceName(
- uint16_t index,
- char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]) { return -1; }
+ // Device enumeration
+ virtual int16_t PlayoutDevices() OVERRIDE;
+ virtual int16_t RecordingDevices() OVERRIDE;
+ virtual int32_t PlayoutDeviceName(uint16_t index,
+ char name[kAdmMaxDeviceNameSize],
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
+ virtual int32_t RecordingDeviceName(uint16_t index,
+ char name[kAdmMaxDeviceNameSize],
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
- // Device selection
- virtual int32_t SetPlayoutDevice(uint16_t index) { return -1; }
- virtual int32_t SetPlayoutDevice(
- AudioDeviceModule::WindowsDeviceType device) { return -1; }
- virtual int32_t SetRecordingDevice(uint16_t index) {
- return -1;
- }
- virtual int32_t SetRecordingDevice(
- AudioDeviceModule::WindowsDeviceType device) { return -1; }
+ // Device selection
+ virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
+ virtual int32_t SetPlayoutDevice(
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
+ virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
+ virtual int32_t SetRecordingDevice(
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
- // Audio transport initialization
- virtual int32_t PlayoutIsAvailable(bool& available) {
- return -1; }
- virtual int32_t InitPlayout() { return -1; };
- virtual bool PlayoutIsInitialized() const { return false; }
- virtual int32_t RecordingIsAvailable(bool& available) { return -1; }
- virtual int32_t InitRecording() { return -1; }
- virtual bool RecordingIsInitialized() const { return false; }
+ // Audio transport initialization
+ virtual int32_t PlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitPlayout() OVERRIDE;
+ virtual bool PlayoutIsInitialized() const OVERRIDE;
+ virtual int32_t RecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitRecording() OVERRIDE;
+ virtual bool RecordingIsInitialized() const OVERRIDE;
- // Audio transport control
- virtual int32_t StartPlayout() { return -1; }
- virtual int32_t StopPlayout() { return -1; }
- virtual bool Playing() const { return false; }
- virtual int32_t StartRecording() { return -1; }
- virtual int32_t StopRecording() { return -1; }
- virtual bool Recording() const { return false; }
+ // Audio transport control
+ virtual int32_t StartPlayout() OVERRIDE;
+ virtual int32_t StopPlayout() OVERRIDE;
+ virtual bool Playing() const OVERRIDE;
+ virtual int32_t StartRecording() OVERRIDE;
+ virtual int32_t StopRecording() OVERRIDE;
+ virtual bool Recording() const OVERRIDE;
- // Microphone Automatic Gain Control (AGC)
- virtual int32_t SetAGC(bool enable) { return -1; }
- virtual bool AGC() const { return false; }
+ // Microphone Automatic Gain Control (AGC)
+ virtual int32_t SetAGC(bool enable) OVERRIDE;
+ virtual bool AGC() const OVERRIDE;
- // Volume control based on the Windows Wave API (Windows only)
- virtual int32_t SetWaveOutVolume(
- uint16_t volumeLeft, uint16_t volumeRight) { return -1; }
- virtual int32_t WaveOutVolume(
- uint16_t& volumeLeft,
- uint16_t& volumeRight) const { return -1; }
+ // Volume control based on the Windows Wave API (Windows only)
+ virtual int32_t SetWaveOutVolume(uint16_t volumeLeft,
+ uint16_t volumeRight) OVERRIDE;
+ virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
+ uint16_t& volumeRight) const OVERRIDE;
- // Audio mixer initialization
- virtual int32_t SpeakerIsAvailable(bool& available) { return -1; }
- virtual int32_t InitSpeaker() { return -1; }
- virtual bool SpeakerIsInitialized() const { return false; }
- virtual int32_t MicrophoneIsAvailable(bool& available) { return -1; }
- virtual int32_t InitMicrophone() { return -1; }
- virtual bool MicrophoneIsInitialized() const { return false; }
+ // Audio mixer initialization
+ virtual int32_t SpeakerIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitSpeaker() OVERRIDE;
+ virtual bool SpeakerIsInitialized() const OVERRIDE;
+ virtual int32_t MicrophoneIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitMicrophone() OVERRIDE;
+ virtual bool MicrophoneIsInitialized() const OVERRIDE;
- // Speaker volume controls
- virtual int32_t SpeakerVolumeIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetSpeakerVolume(uint32_t volume) { return -1; }
- virtual int32_t SpeakerVolume(uint32_t& volume) const {
- return -1;
- }
- virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const {
- return -1;
- }
- virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const {
- return -1;
- }
- virtual int32_t SpeakerVolumeStepSize(
- uint16_t& stepSize) const { return -1; }
+ // Speaker volume controls
+ virtual int32_t SpeakerVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t SpeakerVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const OVERRIDE;
+ virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const OVERRIDE;
- // Microphone volume controls
- virtual int32_t MicrophoneVolumeIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetMicrophoneVolume(uint32_t volume) {
- return -1;
- }
- virtual int32_t MicrophoneVolume(uint32_t& volume) const {
- return -1;
- }
- virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const {
- return -1;
- }
- virtual int32_t MinMicrophoneVolume(
- uint32_t& minVolume) const { return -1; }
- virtual int32_t MicrophoneVolumeStepSize(
- uint16_t& stepSize) const { return -1; }
+ // Microphone volume controls
+ virtual int32_t MicrophoneVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t MicrophoneVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const OVERRIDE;
+ virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const OVERRIDE;
- // Speaker mute control
- virtual int32_t SpeakerMuteIsAvailable(bool& available) { return -1; }
- virtual int32_t SetSpeakerMute(bool enable) { return -1; }
- virtual int32_t SpeakerMute(bool& enabled) const { return -1; }
+ // Speaker mute control
+ virtual int32_t SpeakerMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
+ virtual int32_t SpeakerMute(bool& enabled) const OVERRIDE;
- // Microphone mute control
- virtual int32_t MicrophoneMuteIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetMicrophoneMute(bool enable) { return -1; }
- virtual int32_t MicrophoneMute(bool& enabled) const { return -1; }
+ // Microphone mute control
+ virtual int32_t MicrophoneMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneMute(bool& enabled) const OVERRIDE;
- // Microphone boost control
- virtual int32_t MicrophoneBoostIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetMicrophoneBoost(bool enable) { return -1; }
- virtual int32_t MicrophoneBoost(bool& enabled) const { return -1; }
+ // Microphone boost control
+ virtual int32_t MicrophoneBoostIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneBoost(bool& enabled) const OVERRIDE;
- // Stereo support
- virtual int32_t StereoPlayoutIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetStereoPlayout(bool enable) { return -1; }
- virtual int32_t StereoPlayout(bool& enabled) const { return -1; }
- virtual int32_t StereoRecordingIsAvailable(bool& available) {
- return -1;
- }
- virtual int32_t SetStereoRecording(bool enable) { return -1; }
- virtual int32_t StereoRecording(bool& enabled) const { return -1; }
+ // Stereo support
+ virtual int32_t StereoPlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
+ virtual int32_t StereoPlayout(bool& enabled) const OVERRIDE;
+ virtual int32_t StereoRecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
+ virtual int32_t StereoRecording(bool& enabled) const OVERRIDE;
- // Delay information and control
- virtual int32_t SetPlayoutBuffer(
- const AudioDeviceModule::BufferType type,
- uint16_t sizeMS) { return -1; }
- virtual int32_t PlayoutBuffer(
- AudioDeviceModule::BufferType& type,
- uint16_t& sizeMS) const { return -1; }
- virtual int32_t PlayoutDelay(uint16_t& delayMS) const {
- return -1;
- }
- virtual int32_t RecordingDelay(uint16_t& delayMS) const {
- return -1;
- }
+ // Delay information and control
+ virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
+ uint16_t sizeMS) OVERRIDE;
+ virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
+ uint16_t& sizeMS) const OVERRIDE;
+ virtual int32_t PlayoutDelay(uint16_t& delayMS) const OVERRIDE;
+ virtual int32_t RecordingDelay(uint16_t& delayMS) const OVERRIDE;
- // CPU load
- virtual int32_t CPULoad(uint16_t& load) const { return -1; }
+ // CPU load
+ virtual int32_t CPULoad(uint16_t& load) const OVERRIDE;
- virtual bool PlayoutWarning() const { return false; }
- virtual bool PlayoutError() const { return false; }
- virtual bool RecordingWarning() const { return false; }
- virtual bool RecordingError() const { return false; }
- virtual void ClearPlayoutWarning() {}
- virtual void ClearPlayoutError() {}
- virtual void ClearRecordingWarning() {}
- virtual void ClearRecordingError() {}
+ virtual bool PlayoutWarning() const OVERRIDE;
+ virtual bool PlayoutError() const OVERRIDE;
+ virtual bool RecordingWarning() const OVERRIDE;
+ virtual bool RecordingError() const OVERRIDE;
+ virtual void ClearPlayoutWarning() OVERRIDE;
+ virtual void ClearPlayoutError() OVERRIDE;
+ virtual void ClearRecordingWarning() OVERRIDE;
+ virtual void ClearRecordingError() OVERRIDE;
- virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) {}
+ virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) OVERRIDE;
};
} // namespace webrtc
diff --git a/modules/audio_device/dummy/audio_device_utility_dummy.cc b/modules/audio_device/dummy/audio_device_utility_dummy.cc
new file mode 100644
index 0000000..5c7fa4f
--- /dev/null
+++ b/modules/audio_device/dummy/audio_device_utility_dummy.cc
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2013 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.
+ */
+#include "webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h"
+
+namespace webrtc {
+ int32_t AudioDeviceUtilityDummy::Init() { return 0; }
+} // namespace webrtc
+
diff --git a/modules/audio_device/dummy/audio_device_utility_dummy.h b/modules/audio_device/dummy/audio_device_utility_dummy.h
index 8ae89c8..e05e30b 100644
--- a/modules/audio_device/dummy/audio_device_utility_dummy.h
+++ b/modules/audio_device/dummy/audio_device_utility_dummy.h
@@ -22,11 +22,10 @@
{
public:
AudioDeviceUtilityDummy(const int32_t id) {}
- ~AudioDeviceUtilityDummy() {}
+ virtual ~AudioDeviceUtilityDummy() {}
- virtual int32_t Init() { return 0; }
+ virtual int32_t Init() OVERRIDE;
};
-
} // namespace webrtc
#endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_UTILITY_DUMMY_H_
diff --git a/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h
index 9244758..35abc15 100644
--- a/modules/audio_device/linux/audio_device_alsa_linux.h
+++ b/modules/audio_device/linux/audio_device_alsa_linux.h
@@ -31,135 +31,136 @@
{
public:
AudioDeviceLinuxALSA(const int32_t id);
- ~AudioDeviceLinuxALSA();
+ virtual ~AudioDeviceLinuxALSA();
// Retrieve the currently utilized audio layer
virtual int32_t ActiveAudioLayer(
- AudioDeviceModule::AudioLayer& audioLayer) const;
+ AudioDeviceModule::AudioLayer& audioLayer) const OVERRIDE;
// Main initializaton and termination
- virtual int32_t Init();
- virtual int32_t Terminate();
- virtual bool Initialized() const;
+ virtual int32_t Init() OVERRIDE;
+ virtual int32_t Terminate() OVERRIDE;
+ virtual bool Initialized() const OVERRIDE;
// Device enumeration
- virtual int16_t PlayoutDevices();
- virtual int16_t RecordingDevices();
+ virtual int16_t PlayoutDevices() OVERRIDE;
+ virtual int16_t RecordingDevices() OVERRIDE;
virtual int32_t PlayoutDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
virtual int32_t RecordingDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
// Device selection
- virtual int32_t SetPlayoutDevice(uint16_t index);
+ virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
virtual int32_t SetPlayoutDevice(
- AudioDeviceModule::WindowsDeviceType device);
- virtual int32_t SetRecordingDevice(uint16_t index);
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
+ virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
virtual int32_t SetRecordingDevice(
- AudioDeviceModule::WindowsDeviceType device);
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
// Audio transport initialization
- virtual int32_t PlayoutIsAvailable(bool& available);
- virtual int32_t InitPlayout();
- virtual bool PlayoutIsInitialized() const;
- virtual int32_t RecordingIsAvailable(bool& available);
- virtual int32_t InitRecording();
- virtual bool RecordingIsInitialized() const;
+ virtual int32_t PlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitPlayout() OVERRIDE;
+ virtual bool PlayoutIsInitialized() const OVERRIDE;
+ virtual int32_t RecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitRecording() OVERRIDE;
+ virtual bool RecordingIsInitialized() const OVERRIDE;
// Audio transport control
- virtual int32_t StartPlayout();
- virtual int32_t StopPlayout();
- virtual bool Playing() const;
- virtual int32_t StartRecording();
- virtual int32_t StopRecording();
- virtual bool Recording() const;
+ virtual int32_t StartPlayout() OVERRIDE;
+ virtual int32_t StopPlayout() OVERRIDE;
+ virtual bool Playing() const OVERRIDE;
+ virtual int32_t StartRecording() OVERRIDE;
+ virtual int32_t StopRecording() OVERRIDE;
+ virtual bool Recording() const OVERRIDE;
// Microphone Automatic Gain Control (AGC)
- virtual int32_t SetAGC(bool enable);
- virtual bool AGC() const;
+ virtual int32_t SetAGC(bool enable) OVERRIDE;
+ virtual bool AGC() const OVERRIDE;
// Volume control based on the Windows Wave API (Windows only)
- virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
+ virtual int32_t SetWaveOutVolume(uint16_t volumeLeft,
+ uint16_t volumeRight) OVERRIDE;
virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
- uint16_t& volumeRight) const;
+ uint16_t& volumeRight) const OVERRIDE;
// Audio mixer initialization
- virtual int32_t SpeakerIsAvailable(bool& available);
- virtual int32_t InitSpeaker();
- virtual bool SpeakerIsInitialized() const;
- virtual int32_t MicrophoneIsAvailable(bool& available);
- virtual int32_t InitMicrophone();
- virtual bool MicrophoneIsInitialized() const;
+ virtual int32_t SpeakerIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitSpeaker() OVERRIDE;
+ virtual bool SpeakerIsInitialized() const OVERRIDE;
+ virtual int32_t MicrophoneIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitMicrophone() OVERRIDE;
+ virtual bool MicrophoneIsInitialized() const OVERRIDE;
// Speaker volume controls
- virtual int32_t SpeakerVolumeIsAvailable(bool& available);
- virtual int32_t SetSpeakerVolume(uint32_t volume);
- virtual int32_t SpeakerVolume(uint32_t& volume) const;
- virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
- virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
- virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
+ virtual int32_t SpeakerVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t SpeakerVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const OVERRIDE;
+ virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const OVERRIDE;
// Microphone volume controls
- virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
- virtual int32_t SetMicrophoneVolume(uint32_t volume);
- virtual int32_t MicrophoneVolume(uint32_t& volume) const;
- virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
- virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
+ virtual int32_t MicrophoneVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t MicrophoneVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const OVERRIDE;
virtual int32_t MicrophoneVolumeStepSize(
- uint16_t& stepSize) const;
+ uint16_t& stepSize) const OVERRIDE;
// Speaker mute control
- virtual int32_t SpeakerMuteIsAvailable(bool& available);
- virtual int32_t SetSpeakerMute(bool enable);
- virtual int32_t SpeakerMute(bool& enabled) const;
-
+ virtual int32_t SpeakerMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
+ virtual int32_t SpeakerMute(bool& enabled) const OVERRIDE;
+
// Microphone mute control
- virtual int32_t MicrophoneMuteIsAvailable(bool& available);
- virtual int32_t SetMicrophoneMute(bool enable);
- virtual int32_t MicrophoneMute(bool& enabled) const;
+ virtual int32_t MicrophoneMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneMute(bool& enabled) const OVERRIDE;
// Microphone boost control
- virtual int32_t MicrophoneBoostIsAvailable(bool& available);
- virtual int32_t SetMicrophoneBoost(bool enable);
- virtual int32_t MicrophoneBoost(bool& enabled) const;
+ virtual int32_t MicrophoneBoostIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneBoost(bool& enabled) const OVERRIDE;
// Stereo support
- virtual int32_t StereoPlayoutIsAvailable(bool& available);
- virtual int32_t SetStereoPlayout(bool enable);
- virtual int32_t StereoPlayout(bool& enabled) const;
- virtual int32_t StereoRecordingIsAvailable(bool& available);
- virtual int32_t SetStereoRecording(bool enable);
- virtual int32_t StereoRecording(bool& enabled) const;
+ virtual int32_t StereoPlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
+ virtual int32_t StereoPlayout(bool& enabled) const OVERRIDE;
+ virtual int32_t StereoRecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
+ virtual int32_t StereoRecording(bool& enabled) const OVERRIDE;
// Delay information and control
virtual int32_t SetPlayoutBuffer(
const AudioDeviceModule::BufferType type,
- uint16_t sizeMS);
+ uint16_t sizeMS) OVERRIDE;
virtual int32_t PlayoutBuffer(
AudioDeviceModule::BufferType& type,
- uint16_t& sizeMS) const;
- virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
- virtual int32_t RecordingDelay(uint16_t& delayMS) const;
+ uint16_t& sizeMS) const OVERRIDE;
+ virtual int32_t PlayoutDelay(uint16_t& delayMS) const OVERRIDE;
+ virtual int32_t RecordingDelay(uint16_t& delayMS) const OVERRIDE;
// CPU load
- virtual int32_t CPULoad(uint16_t& load) const;
+ virtual int32_t CPULoad(uint16_t& load) const OVERRIDE;
public:
- virtual bool PlayoutWarning() const;
- virtual bool PlayoutError() const;
- virtual bool RecordingWarning() const;
- virtual bool RecordingError() const;
- virtual void ClearPlayoutWarning();
- virtual void ClearPlayoutError();
- virtual void ClearRecordingWarning();
- virtual void ClearRecordingError();
+ virtual bool PlayoutWarning() const OVERRIDE;
+ virtual bool PlayoutError() const OVERRIDE;
+ virtual bool RecordingWarning() const OVERRIDE;
+ virtual bool RecordingError() const OVERRIDE;
+ virtual void ClearPlayoutWarning() OVERRIDE;
+ virtual void ClearPlayoutError() OVERRIDE;
+ virtual void ClearRecordingWarning() OVERRIDE;
+ virtual void ClearRecordingError() OVERRIDE;
public:
- virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
+ virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) OVERRIDE;
private:
int32_t GetDevicesInfo(const int32_t function,
diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h
index 433dc24..c4ca743 100644
--- a/modules/audio_device/linux/audio_device_pulse_linux.h
+++ b/modules/audio_device/linux/audio_device_pulse_linux.h
@@ -93,136 +93,137 @@
{
public:
AudioDeviceLinuxPulse(const int32_t id);
- ~AudioDeviceLinuxPulse();
+ virtual ~AudioDeviceLinuxPulse();
static bool PulseAudioIsSupported();
// Retrieve the currently utilized audio layer
- virtual int32_t
- ActiveAudioLayer(AudioDeviceModule::AudioLayer& audioLayer) const;
+ virtual int32_t ActiveAudioLayer(
+ AudioDeviceModule::AudioLayer& audioLayer) const OVERRIDE;
// Main initializaton and termination
- virtual int32_t Init();
- virtual int32_t Terminate();
- virtual bool Initialized() const;
+ virtual int32_t Init() OVERRIDE;
+ virtual int32_t Terminate() OVERRIDE;
+ virtual bool Initialized() const OVERRIDE;
// Device enumeration
- virtual int16_t PlayoutDevices();
- virtual int16_t RecordingDevices();
+ virtual int16_t PlayoutDevices() OVERRIDE;
+ virtual int16_t RecordingDevices() OVERRIDE;
virtual int32_t PlayoutDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
virtual int32_t RecordingDeviceName(
uint16_t index,
char name[kAdmMaxDeviceNameSize],
- char guid[kAdmMaxGuidSize]);
+ char guid[kAdmMaxGuidSize]) OVERRIDE;
// Device selection
- virtual int32_t SetPlayoutDevice(uint16_t index);
+ virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
virtual int32_t SetPlayoutDevice(
- AudioDeviceModule::WindowsDeviceType device);
- virtual int32_t SetRecordingDevice(uint16_t index);
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
+ virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
virtual int32_t SetRecordingDevice(
- AudioDeviceModule::WindowsDeviceType device);
+ AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
// Audio transport initialization
- virtual int32_t PlayoutIsAvailable(bool& available);
- virtual int32_t InitPlayout();
- virtual bool PlayoutIsInitialized() const;
- virtual int32_t RecordingIsAvailable(bool& available);
- virtual int32_t InitRecording();
- virtual bool RecordingIsInitialized() const;
+ virtual int32_t PlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitPlayout() OVERRIDE;
+ virtual bool PlayoutIsInitialized() const OVERRIDE;
+ virtual int32_t RecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitRecording() OVERRIDE;
+ virtual bool RecordingIsInitialized() const OVERRIDE;
// Audio transport control
- virtual int32_t StartPlayout();
- virtual int32_t StopPlayout();
- virtual bool Playing() const;
- virtual int32_t StartRecording();
- virtual int32_t StopRecording();
- virtual bool Recording() const;
+ virtual int32_t StartPlayout() OVERRIDE;
+ virtual int32_t StopPlayout() OVERRIDE;
+ virtual bool Playing() const OVERRIDE;
+ virtual int32_t StartRecording() OVERRIDE;
+ virtual int32_t StopRecording() OVERRIDE;
+ virtual bool Recording() const OVERRIDE;
// Microphone Automatic Gain Control (AGC)
- virtual int32_t SetAGC(bool enable);
- virtual bool AGC() const;
+ virtual int32_t SetAGC(bool enable) OVERRIDE;
+ virtual bool AGC() const OVERRIDE;
// Volume control based on the Windows Wave API (Windows only)
- virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
+ virtual int32_t SetWaveOutVolume(uint16_t volumeLeft,
+ uint16_t volumeRight) OVERRIDE;
virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
- uint16_t& volumeRight) const;
+ uint16_t& volumeRight) const OVERRIDE;
// Audio mixer initialization
- virtual int32_t SpeakerIsAvailable(bool& available);
- virtual int32_t InitSpeaker();
- virtual bool SpeakerIsInitialized() const;
- virtual int32_t MicrophoneIsAvailable(bool& available);
- virtual int32_t InitMicrophone();
- virtual bool MicrophoneIsInitialized() const;
+ virtual int32_t SpeakerIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitSpeaker() OVERRIDE;
+ virtual bool SpeakerIsInitialized() const OVERRIDE;
+ virtual int32_t MicrophoneIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t InitMicrophone() OVERRIDE;
+ virtual bool MicrophoneIsInitialized() const OVERRIDE;
// Speaker volume controls
- virtual int32_t SpeakerVolumeIsAvailable(bool& available);
- virtual int32_t SetSpeakerVolume(uint32_t volume);
- virtual int32_t SpeakerVolume(uint32_t& volume) const;
- virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
- virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
- virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
+ virtual int32_t SpeakerVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t SpeakerVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const OVERRIDE;
+ virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const OVERRIDE;
// Microphone volume controls
- virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
- virtual int32_t SetMicrophoneVolume(uint32_t volume);
- virtual int32_t MicrophoneVolume(uint32_t& volume) const;
- virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
- virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
+ virtual int32_t MicrophoneVolumeIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
+ virtual int32_t MicrophoneVolume(uint32_t& volume) const OVERRIDE;
+ virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const OVERRIDE;
+ virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const OVERRIDE;
virtual int32_t MicrophoneVolumeStepSize(
- uint16_t& stepSize) const;
+ uint16_t& stepSize) const OVERRIDE;
// Speaker mute control
- virtual int32_t SpeakerMuteIsAvailable(bool& available);
- virtual int32_t SetSpeakerMute(bool enable);
- virtual int32_t SpeakerMute(bool& enabled) const;
+ virtual int32_t SpeakerMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
+ virtual int32_t SpeakerMute(bool& enabled) const OVERRIDE;
// Microphone mute control
- virtual int32_t MicrophoneMuteIsAvailable(bool& available);
- virtual int32_t SetMicrophoneMute(bool enable);
- virtual int32_t MicrophoneMute(bool& enabled) const;
+ virtual int32_t MicrophoneMuteIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneMute(bool& enabled) const OVERRIDE;
// Microphone boost control
- virtual int32_t MicrophoneBoostIsAvailable(bool& available);
- virtual int32_t SetMicrophoneBoost(bool enable);
- virtual int32_t MicrophoneBoost(bool& enabled) const;
+ virtual int32_t MicrophoneBoostIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
+ virtual int32_t MicrophoneBoost(bool& enabled) const OVERRIDE;
// Stereo support
- virtual int32_t StereoPlayoutIsAvailable(bool& available);
- virtual int32_t SetStereoPlayout(bool enable);
- virtual int32_t StereoPlayout(bool& enabled) const;
- virtual int32_t StereoRecordingIsAvailable(bool& available);
- virtual int32_t SetStereoRecording(bool enable);
- virtual int32_t StereoRecording(bool& enabled) const;
+ virtual int32_t StereoPlayoutIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
+ virtual int32_t StereoPlayout(bool& enabled) const OVERRIDE;
+ virtual int32_t StereoRecordingIsAvailable(bool& available) OVERRIDE;
+ virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
+ virtual int32_t StereoRecording(bool& enabled) const OVERRIDE;
// Delay information and control
virtual int32_t
SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
- uint16_t sizeMS);
+ uint16_t sizeMS) OVERRIDE;
virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
- uint16_t& sizeMS) const;
- virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
- virtual int32_t RecordingDelay(uint16_t& delayMS) const;
+ uint16_t& sizeMS) const OVERRIDE;
+ virtual int32_t PlayoutDelay(uint16_t& delayMS) const OVERRIDE;
+ virtual int32_t RecordingDelay(uint16_t& delayMS) const OVERRIDE;
// CPU load
- virtual int32_t CPULoad(uint16_t& load) const;
+ virtual int32_t CPULoad(uint16_t& load) const OVERRIDE;
public:
- virtual bool PlayoutWarning() const;
- virtual bool PlayoutError() const;
- virtual bool RecordingWarning() const;
- virtual bool RecordingError() const;
- virtual void ClearPlayoutWarning();
- virtual void ClearPlayoutError();
- virtual void ClearRecordingWarning();
- virtual void ClearRecordingError();
+ virtual bool PlayoutWarning() const OVERRIDE;
+ virtual bool PlayoutError() const OVERRIDE;
+ virtual bool RecordingWarning() const OVERRIDE;
+ virtual bool RecordingError() const OVERRIDE;
+ virtual void ClearPlayoutWarning() OVERRIDE;
+ virtual void ClearPlayoutError() OVERRIDE;
+ virtual void ClearRecordingWarning() OVERRIDE;
+ virtual void ClearRecordingError() OVERRIDE;
public:
- virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
+ virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) OVERRIDE;
private:
void Lock()
diff --git a/modules/audio_device/linux/audio_device_utility_linux.h b/modules/audio_device/linux/audio_device_utility_linux.h
index b56023f..0dc2646 100644
--- a/modules/audio_device/linux/audio_device_utility_linux.h
+++ b/modules/audio_device/linux/audio_device_utility_linux.h
@@ -22,9 +22,9 @@
{
public:
AudioDeviceUtilityLinux(const int32_t id);
- ~AudioDeviceUtilityLinux();
+ virtual ~AudioDeviceUtilityLinux();
- virtual int32_t Init();
+ virtual int32_t Init() OVERRIDE;
private:
CriticalSectionWrapper& _critSect;