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@4426 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-07-30 12:32:59 +00:00
parent 10bbfeff5b
commit 096515b070
9 changed files with 591 additions and 393 deletions

View File

@ -31,135 +31,136 @@ class AudioDeviceLinuxALSA : public AudioDeviceGeneric
{
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,

View File

@ -93,136 +93,137 @@ class AudioDeviceLinuxPulse: public AudioDeviceGeneric
{
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()

View File

@ -22,9 +22,9 @@ class AudioDeviceUtilityLinux: public AudioDeviceUtility
{
public:
AudioDeviceUtilityLinux(const int32_t id);
~AudioDeviceUtilityLinux();
virtual ~AudioDeviceUtilityLinux();
virtual int32_t Init();
virtual int32_t Init() OVERRIDE;
private:
CriticalSectionWrapper& _critSect;