Index: content/renderer/media/webrtc_audio_device_not_impl.h |
diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h |
index dc7fc8cedb2e7d8fa31f0c227e32db296c6e5fc7..00c6a231a8af626bdf8f775367ddfc8a17a5cb48 100644 |
--- a/content/renderer/media/webrtc_audio_device_not_impl.h |
+++ b/content/renderer/media/webrtc_audio_device_not_impl.h |
@@ -28,87 +28,82 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl |
// TODO(henrika): it is possible to add functionality in these methods. |
// Only adding very basic support for now without triggering any callback |
// in the webrtc::AudioDeviceObserver interface. |
- virtual int32_t ChangeUniqueId(const int32_t id) override; |
- virtual int32_t TimeUntilNextProcess() override; |
- virtual int32_t Process() override; |
+ int32_t ChangeUniqueId(const int32_t id) override; |
+ int32_t TimeUntilNextProcess() override; |
+ int32_t Process() override; |
// Methods in webrtc::AudioDeviceModule which are not yet implemented. |
// The idea is that we can move methods from this class to the real |
// implementation in WebRtcAudioDeviceImpl when needed. |
- virtual int32_t RegisterEventObserver( |
+ int32_t RegisterEventObserver( |
webrtc::AudioDeviceObserver* event_callback) override; |
- virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override; |
- virtual webrtc::AudioDeviceModule::ErrorCode LastError() const override; |
- virtual int16_t PlayoutDevices() override; |
- virtual int16_t RecordingDevices() override; |
- virtual int32_t PlayoutDeviceName( |
- uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], |
- char guid[webrtc::kAdmMaxGuidSize]) override; |
- virtual int32_t RecordingDeviceName( |
- uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], |
- char guid[webrtc::kAdmMaxGuidSize]) override; |
- 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; |
- virtual int32_t InitPlayout() override; |
- virtual int32_t InitRecording() override; |
- virtual int32_t SetWaveOutVolume(uint16_t volume_left, |
- uint16_t volume_right) override; |
- virtual int32_t WaveOutVolume(uint16_t* volume_left, |
- uint16_t* volume_right) const override; |
- virtual int32_t InitSpeaker() override; |
- virtual bool SpeakerIsInitialized() const override; |
- virtual int32_t InitMicrophone() override; |
- virtual bool MicrophoneIsInitialized() const override; |
- 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* max_volume) const override; |
- virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const override; |
- virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override; |
- virtual int32_t MicrophoneVolumeIsAvailable(bool* available) override; |
- virtual int32_t MicrophoneVolumeStepSize( |
- uint16_t* step_size) const override; |
- virtual int32_t SpeakerMuteIsAvailable(bool* available) override; |
- virtual int32_t SetSpeakerMute(bool enable) override; |
- virtual int32_t SpeakerMute(bool* enabled) const override; |
- virtual int32_t MicrophoneMuteIsAvailable(bool* available) override; |
- virtual int32_t SetMicrophoneMute(bool enable) override; |
- virtual int32_t MicrophoneMute(bool* enabled) const override; |
- virtual int32_t MicrophoneBoostIsAvailable(bool* available) override; |
- virtual int32_t SetMicrophoneBoost(bool enable) override; |
- virtual int32_t MicrophoneBoost(bool* enabled) const override; |
- virtual int32_t SetStereoPlayout(bool enable) override; |
- virtual int32_t StereoPlayout(bool* enabled) 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; |
- virtual int32_t SetPlayoutBuffer( |
- const BufferType type, uint16_t size_ms) override; |
- virtual int32_t PlayoutBuffer( |
- BufferType* type, uint16_t* size_ms) const override; |
- virtual int32_t CPULoad(uint16_t* load) const override; |
- virtual int32_t StartRawOutputFileRecording( |
+ int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override; |
+ webrtc::AudioDeviceModule::ErrorCode LastError() const override; |
+ int16_t PlayoutDevices() override; |
+ int16_t RecordingDevices() override; |
+ int32_t PlayoutDeviceName(uint16_t index, |
+ char name[webrtc::kAdmMaxDeviceNameSize], |
+ char guid[webrtc::kAdmMaxGuidSize]) override; |
+ int32_t RecordingDeviceName(uint16_t index, |
+ char name[webrtc::kAdmMaxDeviceNameSize], |
+ char guid[webrtc::kAdmMaxGuidSize]) override; |
+ int32_t SetPlayoutDevice(uint16_t index) override; |
+ int32_t SetPlayoutDevice(WindowsDeviceType device) override; |
+ int32_t SetRecordingDevice(uint16_t index) override; |
+ int32_t SetRecordingDevice(WindowsDeviceType device) override; |
+ int32_t InitPlayout() override; |
+ int32_t InitRecording() override; |
+ int32_t SetWaveOutVolume(uint16_t volume_left, |
+ uint16_t volume_right) override; |
+ int32_t WaveOutVolume(uint16_t* volume_left, |
+ uint16_t* volume_right) const override; |
+ int32_t InitSpeaker() override; |
+ bool SpeakerIsInitialized() const override; |
+ int32_t InitMicrophone() override; |
+ bool MicrophoneIsInitialized() const override; |
+ int32_t SpeakerVolumeIsAvailable(bool* available) override; |
+ int32_t SetSpeakerVolume(uint32_t volume) override; |
+ int32_t SpeakerVolume(uint32_t* volume) const override; |
+ int32_t MaxSpeakerVolume(uint32_t* max_volume) const override; |
+ int32_t MinSpeakerVolume(uint32_t* min_volume) const override; |
+ int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override; |
+ int32_t MicrophoneVolumeIsAvailable(bool* available) override; |
+ int32_t MicrophoneVolumeStepSize(uint16_t* step_size) const override; |
+ int32_t SpeakerMuteIsAvailable(bool* available) override; |
+ int32_t SetSpeakerMute(bool enable) override; |
+ int32_t SpeakerMute(bool* enabled) const override; |
+ int32_t MicrophoneMuteIsAvailable(bool* available) override; |
+ int32_t SetMicrophoneMute(bool enable) override; |
+ int32_t MicrophoneMute(bool* enabled) const override; |
+ int32_t MicrophoneBoostIsAvailable(bool* available) override; |
+ int32_t SetMicrophoneBoost(bool enable) override; |
+ int32_t MicrophoneBoost(bool* enabled) const override; |
+ int32_t SetStereoPlayout(bool enable) override; |
+ int32_t StereoPlayout(bool* enabled) const override; |
+ int32_t SetStereoRecording(bool enable) override; |
+ int32_t StereoRecording(bool* enabled) const override; |
+ int32_t SetRecordingChannel(const ChannelType channel) override; |
+ int32_t RecordingChannel(ChannelType* channel) const override; |
+ int32_t SetPlayoutBuffer(const BufferType type, uint16_t size_ms) override; |
+ int32_t PlayoutBuffer(BufferType* type, uint16_t* size_ms) const override; |
+ int32_t CPULoad(uint16_t* load) const override; |
+ int32_t StartRawOutputFileRecording( |
const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; |
- virtual int32_t StopRawOutputFileRecording() override; |
- virtual int32_t StartRawInputFileRecording( |
+ int32_t StopRawOutputFileRecording() override; |
+ int32_t StartRawInputFileRecording( |
const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; |
- virtual int32_t StopRawInputFileRecording() override; |
- virtual int32_t SetRecordingSampleRate( |
- const uint32_t samples_per_sec) override; |
- virtual int32_t SetPlayoutSampleRate( |
- const uint32_t samples_per_sec) override; |
- virtual int32_t ResetAudioDevice() override; |
- virtual int32_t SetLoudspeakerStatus(bool enable) override; |
- virtual int32_t GetLoudspeakerStatus(bool* enabled) const override; |
- virtual int32_t SetAGC(bool enable) override; |
- virtual bool AGC() const override; |
+ int32_t StopRawInputFileRecording() override; |
+ int32_t SetRecordingSampleRate(const uint32_t samples_per_sec) override; |
+ int32_t SetPlayoutSampleRate(const uint32_t samples_per_sec) override; |
+ int32_t ResetAudioDevice() override; |
+ int32_t SetLoudspeakerStatus(bool enable) override; |
+ int32_t GetLoudspeakerStatus(bool* enabled) const override; |
+ int32_t SetAGC(bool enable) override; |
+ bool AGC() const override; |
protected: |
- virtual ~WebRtcAudioDeviceNotImpl() {}; |
+ ~WebRtcAudioDeviceNotImpl() override{}; |
private: |
base::TimeTicks last_process_time_; |