diff options
Diffstat (limited to 'media/audio')
65 files changed, 389 insertions, 389 deletions
diff --git a/media/audio/agc_audio_stream.h b/media/audio/agc_audio_stream.h index 940d964..f7b909f 100644 --- a/media/audio/agc_audio_stream.h +++ b/media/audio/agc_audio_stream.h @@ -138,14 +138,14 @@ class MEDIA_EXPORT AgcAudioStream : public AudioInterface { // be read in each AudioInputCallback::OnData() callback and fed to the // render-side AGC. User must call StartAgc() as well to start measuring // the microphone level. - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE { + virtual void SetAutomaticGainControl(bool enabled) override { DVLOG(1) << "SetAutomaticGainControl(enabled=" << enabled << ")"; DCHECK(thread_checker_.CalledOnValidThread()); agc_is_enabled_ = enabled; } // Gets the current automatic gain control state. - virtual bool GetAutomaticGainControl() OVERRIDE { + virtual bool GetAutomaticGainControl() override { DCHECK(thread_checker_.CalledOnValidThread()); return agc_is_enabled_; } diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h index c26f3e2..adc2619 100644 --- a/media/audio/alsa/alsa_input.h +++ b/media/audio/alsa/alsa_input.h @@ -42,13 +42,13 @@ class AlsaPcmInputStream : public AgcAudioStream<AudioInputStream> { virtual ~AlsaPcmInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // Logs the error and invokes any registered callbacks. diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h index e6e22df..dfc044d 100644 --- a/media/audio/alsa/alsa_output.h +++ b/media/audio/alsa/alsa_output.h @@ -75,12 +75,12 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream { virtual ~AlsaPcmOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: friend class AlsaPcmOutputStreamTest; diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc index 3b6592b..a68be4b 100644 --- a/media/audio/alsa/alsa_output_unittest.cc +++ b/media/audio/alsa/alsa_output_unittest.cc @@ -85,14 +85,14 @@ class MockAudioManagerAlsa : public AudioManagerAlsa { // of active output streams. It is because the number of active streams // is managed inside MakeAudioOutputStream, and we don't use // MakeAudioOutputStream to create the stream in the tests. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE { + virtual void ReleaseOutputStream(AudioOutputStream* stream) override { DCHECK(stream); delete stream; } // We don't mock this method since all tests will do the same thing // and use the current task runner. - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE { + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override { return base::MessageLoop::current()->message_loop_proxy(); } diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h index d08c3ba..40801fc 100644 --- a/media/audio/alsa/audio_manager_alsa.h +++ b/media/audio/alsa/audio_manager_alsa.h @@ -22,33 +22,33 @@ class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase { static void ShowLinuxAudioInputSettings(); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual ~AudioManagerAlsa(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: enum StreamType { diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc index 6fa7987..3364c5f 100644 --- a/media/audio/android/audio_android_unittest.cc +++ b/media/audio/android/audio_android_unittest.cc @@ -178,7 +178,7 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback { // Use samples read from a data file and fill up the audio buffer // provided to us in the callback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { bool stop_playing = false; int max_size = audio_bus->frames() * audio_bus->channels() * kBytesPerSample; @@ -206,7 +206,7 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback { return frames; } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} int file_size() { return file_->data_size(); } @@ -265,7 +265,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const int num_samples = src->frames() * src->channels(); scoped_ptr<int16> interleaved(new int16[num_samples]); const int bytes_per_sample = sizeof(*interleaved); @@ -279,7 +279,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback { event_->Signal(); } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} private: base::WaitableEvent* event_; @@ -313,7 +313,7 @@ class FullDuplexAudioSinkSource virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const base::TimeTicks now_time = base::TimeTicks::Now(); const int diff = (now_time - previous_time_).InMilliseconds(); @@ -350,11 +350,11 @@ class FullDuplexAudioSinkSource } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} // AudioOutputStream::AudioSourceCallback implementation virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { const int size_in_bytes = (params_.bits_per_sample() / 8) * dest->frames() * dest->channels(); EXPECT_EQ(size_in_bytes, params_.GetBytesPerBuffer()); @@ -382,7 +382,7 @@ class FullDuplexAudioSinkSource return dest->frames(); } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} private: // Converts from bytes to milliseconds given number of bytes and existing diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h index ee5ad28..d1a8c8b 100644 --- a/media/audio/android/audio_manager_android.h +++ b/media/audio/android/audio_manager_android.h @@ -23,36 +23,36 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { AudioManagerAndroid(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeAudioInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE; - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE; + const std::string& device_id) override; + virtual void ReleaseOutputStream(AudioOutputStream* stream) override; + virtual void ReleaseInputStream(AudioInputStream* stream) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; static bool RegisterAudioManager(JNIEnv* env); @@ -63,7 +63,7 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: void InitializeOnAudioThread(); diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h index c240038..198fd59 100644 --- a/media/audio/android/audio_record_input.h +++ b/media/audio/android/audio_record_input.h @@ -31,15 +31,15 @@ class MEDIA_EXPORT AudioRecordInputStream : public AudioInputStream { virtual ~AudioRecordInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; static bool RegisterAudioRecordInput(JNIEnv* env); diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h index 288ab43..2998e53 100644 --- a/media/audio/android/opensles_input.h +++ b/media/audio/android/opensles_input.h @@ -34,15 +34,15 @@ class OpenSLESInputStream : public AudioInputStream { virtual ~OpenSLESInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: bool CreateRecorder(); diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h index b0b678c..914fa6e 100644 --- a/media/audio/android/opensles_output.h +++ b/media/audio/android/opensles_output.h @@ -34,12 +34,12 @@ class OpenSLESOutputStream : public AudioOutputStream { virtual ~OpenSLESOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; // Set the value of |muted_|. It does not affect |volume_| which can be // got by calling GetVolume(). See comments for |muted_| below. diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc index 0c0c86c..98d1018 100644 --- a/media/audio/audio_device_thread.cc +++ b/media/audio/audio_device_thread.cc @@ -45,7 +45,7 @@ class AudioDeviceThread::Thread virtual ~Thread(); // Overrides from PlatformThread::Delegate. - virtual void ThreadMain() OVERRIDE; + virtual void ThreadMain() override; // Runs the loop that reads from the socket. void Run(); diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index 150daa2..a14bf33 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -231,8 +231,8 @@ class MEDIA_EXPORT AudioInputController virtual void OnData(AudioInputStream* stream, const AudioBus* source, uint32 hardware_delay_bytes, - double volume) OVERRIDE; - virtual void OnError(AudioInputStream* stream) OVERRIDE; + double volume) override; + virtual void OnError(AudioInputStream* stream) override; bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; } diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index bf140cb..d54c72a 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc @@ -33,10 +33,10 @@ class AudioInputDevice::AudioThreadCallback CaptureCallback* capture_callback); virtual ~AudioThreadCallback(); - virtual void MapSharedMemory() OVERRIDE; + virtual void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) OVERRIDE; + virtual void Process(int pending_data) override; private: int current_segment_id_; diff --git a/media/audio/audio_input_device.h b/media/audio/audio_input_device.h index 0c39002..b971176 100644 --- a/media/audio/audio_input_device.h +++ b/media/audio/audio_input_device.h @@ -87,11 +87,11 @@ class MEDIA_EXPORT AudioInputDevice // AudioCapturerSource implementation. virtual void Initialize(const AudioParameters& params, CaptureCallback* callback, - int session_id) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; + int session_id) override; + virtual void Start() override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void SetAutomaticGainControl(bool enabled) override; protected: friend class base::RefCountedThreadSafe<AudioInputDevice>; @@ -102,11 +102,11 @@ class MEDIA_EXPORT AudioInputDevice virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, int length, - int total_segments) OVERRIDE; - virtual void OnVolume(double volume) OVERRIDE; + int total_segments) override; + virtual void OnVolume(double volume) override; virtual void OnStateChanged( - AudioInputIPCDelegate::State state) OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + AudioInputIPCDelegate::State state) override; + virtual void OnIPCClosed() override; private: // Note: The ordering of members in this enum is critical to correct behavior! @@ -128,7 +128,7 @@ class MEDIA_EXPORT AudioInputDevice // base::MessageLoop::DestructionObserver implementation for the IO loop. // If the IO loop dies before we do, we shut down the audio thread from here. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; AudioParameters audio_parameters_; diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 0bae9db..3c977b0 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -26,10 +26,10 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* source, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { ++callback_count_; } - virtual void OnError(AudioInputStream* stream) OVERRIDE { + virtual void OnError(AudioInputStream* stream) override { ++had_error_; } // Returns how many times OnData() has been called. diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 3d61ae6..49a0e1c 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc @@ -95,7 +95,7 @@ class MockAudioManager : public AudioManagerAnyPlatform { MockAudioManager() : AudioManagerAnyPlatform(&fake_audio_log_factory_) {} virtual ~MockAudioManager() {} - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE { + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override { return base::MessageLoop::current()->message_loop_proxy(); } @@ -194,7 +194,7 @@ class FullDuplexAudioSinkSource virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { base::AutoLock lock(lock_); // Update three components in the AudioDelayState for this recorded @@ -222,11 +222,11 @@ class FullDuplexAudioSinkSource // } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} // AudioOutputStream::AudioSourceCallback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { base::AutoLock lock(lock_); // Update one component in the AudioDelayState for the packet @@ -254,7 +254,7 @@ class FullDuplexAudioSinkSource return 0; } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} protected: // Converts from bytes to milliseconds taking the sample rate and size diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 40fb6c3..6ed8fd4 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -48,30 +48,30 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { virtual ~AudioManagerBase(); - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE; + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - OVERRIDE; + override; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; + virtual base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeAudioInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioOutputStream* MakeAudioOutputStreamProxy( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Called internally by the audio stream when it has been closed. virtual void ReleaseOutputStream(AudioOutputStream* stream); @@ -98,24 +98,24 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { // Listeners will be notified on the GetTaskRunner() task runner. virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE; + virtual AudioParameters GetDefaultOutputStreamParameters() override; virtual AudioParameters GetOutputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioLogFactory::AudioComponent component) OVERRIDE; + AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() OVERRIDE; + virtual void SetHasKeyboardMic() override; // Get number of input or output streams. int input_stream_count() const { return num_input_streams_; } diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h index 029c58a..3058f58 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -155,19 +155,19 @@ class MEDIA_EXPORT AudioOutputController // AudioSourceCallback implementation. virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // AudioDeviceListener implementation. When called AudioOutputController will // shutdown the existing |stream_|, transition to the kRecreating state, // create a new stream, and then transition back to an equivalent state prior // to being called. - virtual void OnDeviceChange() OVERRIDE; + virtual void OnDeviceChange() override; // AudioSourceDiverter implementation. - virtual const AudioParameters& GetAudioParameters() OVERRIDE; - virtual void StartDiverting(AudioOutputStream* to_stream) OVERRIDE; - virtual void StopDiverting() OVERRIDE; + virtual const AudioParameters& GetAudioParameters() override; + virtual void StartDiverting(AudioOutputStream* to_stream) override; + virtual void StopDiverting() override; // Accessor for AudioPowerMonitor::ReadCurrentPowerAndClip(). See comments in // audio_power_monitor.h for usage. This may be called on any thread. diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 5cc6021..d18a764 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc @@ -25,10 +25,10 @@ class AudioOutputDevice::AudioThreadCallback AudioRendererSink::RenderCallback* render_callback); virtual ~AudioThreadCallback(); - virtual void MapSharedMemory() OVERRIDE; + virtual void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) OVERRIDE; + virtual void Process(int pending_data) override; private: AudioRendererSink::RenderCallback* render_callback_; diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h index 0d53d8b..b2e0b14 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h @@ -89,20 +89,20 @@ class MEDIA_EXPORT AudioOutputDevice // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; + virtual bool SetVolume(double volume) override; // Methods called on IO thread ---------------------------------------------- // AudioOutputIPCDelegate methods. - virtual void OnStateChanged(AudioOutputIPCDelegate::State state) OVERRIDE; + virtual void OnStateChanged(AudioOutputIPCDelegate::State state) override; virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, - int length) OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + int length) override; + virtual void OnIPCClosed() override; protected: // Magic required by ref_counted.h to avoid any code deleting the object @@ -132,7 +132,7 @@ class MEDIA_EXPORT AudioOutputDevice // base::MessageLoop::DestructionObserver implementation for the IO loop. // If the IO loop dies before we do, we shut down the audio thread from here. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; AudioParameters audio_parameters_; diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h index 52d647a..031896f 100644 --- a/media/audio/audio_output_dispatcher_impl.h +++ b/media/audio/audio_output_dispatcher_impl.h @@ -40,26 +40,26 @@ class MEDIA_EXPORT AudioOutputDispatcherImpl : public AudioOutputDispatcher { // Opens a new physical stream if there are no pending streams in // |idle_streams_|. Do not call Close() or Stop() if this method fails. - virtual bool OpenStream() OVERRIDE; + virtual bool OpenStream() override; // If there are pending streams in |idle_streams_| then it reuses one of // them, otherwise creates a new one. virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, - AudioOutputProxy* stream_proxy) OVERRIDE; + AudioOutputProxy* stream_proxy) override; // Stops the stream assigned to the specified proxy and moves it into // |idle_streams_| for reuse by other proxies. - virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE; + virtual void StopStream(AudioOutputProxy* stream_proxy) override; virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, - double volume) OVERRIDE; + double volume) override; // Closes |idle_streams_| until the number of |idle_streams_| is equal to the // |idle_proxies_| count. If there are no |idle_proxies_| a single stream is // kept alive until |close_timer_| fires. - virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE; + virtual void CloseStream(AudioOutputProxy* stream_proxy) override; - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputDispatcherImpl>; diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index 86dab51..a1e79dc 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -32,12 +32,12 @@ class MEDIA_EXPORT AudioOutputProxy explicit AudioOutputProxy(AudioOutputDispatcher* dispatcher); // AudioOutputStream interface. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: enum State { diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index fd72a23..a1c5768 100644 --- a/media/audio/audio_output_proxy_unittest.cc +++ b/media/audio/audio_output_proxy_unittest.cc @@ -417,7 +417,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { AudioOutputProxyTest::TearDown(); } - virtual void InitDispatcher(base::TimeDelta close_delay) OVERRIDE { + virtual void InitDispatcher(base::TimeDelta close_delay) override { // Use a low sample rate and large buffer size when testing otherwise the // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e., // RunUntilIdle() will never terminate. @@ -428,7 +428,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { &manager(), params_, resampler_params_, std::string(), close_delay); } - virtual void OnStart() OVERRIDE { + virtual void OnStart() override { // Let Start() run for a bit. base::RunLoop run_loop; message_loop_.PostDelayedTask( diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index 42c2ea89..4c4b601 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -31,8 +31,8 @@ class OnMoreDataConverter // AudioSourceCallback interface. virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // Sets |source_callback_|. If this is not a new object, then Stop() must be // called before Start(). @@ -46,7 +46,7 @@ class OnMoreDataConverter private: // AudioConverter::InputCallback implementation. virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Ratio of input bytes to output bytes used to correct playback delay with // regard to buffering and resampling. diff --git a/media/audio/audio_output_resampler.h b/media/audio/audio_output_resampler.h index af7ebf2..085330b 100644 --- a/media/audio/audio_output_resampler.h +++ b/media/audio/audio_output_resampler.h @@ -44,14 +44,14 @@ class MEDIA_EXPORT AudioOutputResampler : public AudioOutputDispatcher { const base::TimeDelta& close_delay); // AudioOutputDispatcher interface. - virtual bool OpenStream() OVERRIDE; + virtual bool OpenStream() override; virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, - AudioOutputProxy* stream_proxy) OVERRIDE; - virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE; + AudioOutputProxy* stream_proxy) override; + virtual void StopStream(AudioOutputProxy* stream_proxy) override; virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, - double volume) OVERRIDE; - virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE; - virtual void Shutdown() OVERRIDE; + double volume) override; + virtual void CloseStream(AudioOutputProxy* stream_proxy) override; + virtual void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputResampler>; diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc index 1c98574..1bb22e2 100644 --- a/media/audio/clockless_audio_sink.cc +++ b/media/audio/clockless_audio_sink.cc @@ -35,7 +35,7 @@ class ClocklessAudioSinkThread : public base::DelegateSimpleThread::Delegate { private: // Call Render() repeatedly, keeping track of the rendering time. - virtual void Run() OVERRIDE { + virtual void Run() override { base::TimeTicks start; while (!stop_event_->IsSignaled()) { int frames_received = callback_->Render(audio_bus_.get(), 0); diff --git a/media/audio/clockless_audio_sink.h b/media/audio/clockless_audio_sink.h index bf68896..1c2bf69 100644 --- a/media/audio/clockless_audio_sink.h +++ b/media/audio/clockless_audio_sink.h @@ -26,12 +26,12 @@ class MEDIA_EXPORT ClocklessAudioSink // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Play() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Pause() override; + virtual void Play() override; + virtual bool SetVolume(double volume) override; // Returns the time taken to consume all the audio. base::TimeDelta render_time() { return playback_time_; } diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index 2bf1c0d..0bceb45 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -20,27 +20,27 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { AudioManagerCras(AudioLogFactory* audio_log_factory); // AudioManager implementation. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; - virtual void SetHasKeyboardMic() OVERRIDE; + const std::string& device_id) override; + virtual void SetHasKeyboardMic() override; // AudioManagerBase implementation. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; static snd_pcm_format_t BitsToFormat(int bits_per_sample); @@ -49,7 +49,7 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h index 1919224..4f5614d 100644 --- a/media/audio/cras/cras_input.h +++ b/media/audio/cras/cras_input.h @@ -33,13 +33,13 @@ class CrasInputStream : public AgcAudioStream<AudioInputStream> { virtual ~CrasInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // Handles requests to get samples from the provided buffer. This will be diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc index 7081a98..4113f58 100644 --- a/media/audio/cras/cras_input_unittest.cc +++ b/media/audio/cras/cras_input_unittest.cc @@ -41,7 +41,7 @@ class MockAudioManagerCrasInput : public AudioManagerCras { // of active output streams. It is because the number of active streams // is managed inside MakeAudioInputStream, and we don't use // MakeAudioInputStream to create the stream in the tests. - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE { + virtual void ReleaseInputStream(AudioInputStream* stream) override { DCHECK(stream); delete stream; } diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h index 7e946e0..464fee6 100644 --- a/media/audio/cras/cras_unified.h +++ b/media/audio/cras/cras_unified.h @@ -36,12 +36,12 @@ class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream { virtual ~CrasUnifiedStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // Convert Latency in time to bytes. diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc index 9d282bb..932ccb4 100644 --- a/media/audio/cras/cras_unified_unittest.cc +++ b/media/audio/cras/cras_unified_unittest.cc @@ -49,7 +49,7 @@ class MockAudioManagerCras : public AudioManagerCras { // of active output streams. It is because the number of active streams // is managed inside MakeAudioOutputStream, and we don't use // MakeAudioOutputStream to create the stream in the tests. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE { + virtual void ReleaseOutputStream(AudioOutputStream* stream) override { DCHECK(stream); delete stream; } diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 4c3c24c..db00c2e 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -27,15 +27,15 @@ class MEDIA_EXPORT FakeAudioInputStream static AudioInputStream* MakeFakeStream(AudioManagerBase* manager, const AudioParameters& params); - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; // Generate one beep sound. This method is called by // FakeVideoCaptureDevice to test audio/video synchronization. diff --git a/media/audio/fake_audio_log_factory.cc b/media/audio/fake_audio_log_factory.cc index 5e2d134..af5dc8e 100644 --- a/media/audio/fake_audio_log_factory.cc +++ b/media/audio/fake_audio_log_factory.cc @@ -12,12 +12,12 @@ class FakeAudioLogImpl : public AudioLog { virtual ~FakeAudioLogImpl() {} virtual void OnCreated(int component_id, const media::AudioParameters& params, - const std::string& device_id) OVERRIDE {} - virtual void OnStarted(int component_id) OVERRIDE {} - virtual void OnStopped(int component_id) OVERRIDE {} - virtual void OnClosed(int component_id) OVERRIDE {} - virtual void OnError(int component_id) OVERRIDE {} - virtual void OnSetVolume(int component_id, double volume) OVERRIDE {} + const std::string& device_id) override {} + virtual void OnStarted(int component_id) override {} + virtual void OnStopped(int component_id) override {} + virtual void OnClosed(int component_id) override {} + virtual void OnError(int component_id) override {} + virtual void OnSetVolume(int component_id, double volume) override {} }; FakeAudioLogFactory::FakeAudioLogFactory() {} diff --git a/media/audio/fake_audio_log_factory.h b/media/audio/fake_audio_log_factory.h index 30e39e6..c5fae46 100644 --- a/media/audio/fake_audio_log_factory.h +++ b/media/audio/fake_audio_log_factory.h @@ -18,7 +18,7 @@ class MEDIA_EXPORT FakeAudioLogFactory FakeAudioLogFactory(); virtual ~FakeAudioLogFactory(); virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioComponent component) OVERRIDE; + AudioComponent component) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAudioLogFactory); diff --git a/media/audio/fake_audio_manager.h b/media/audio/fake_audio_manager.h index 9fbf140..8fc57bd 100644 --- a/media/audio/fake_audio_manager.h +++ b/media/audio/fake_audio_manager.h @@ -18,30 +18,30 @@ class MEDIA_EXPORT FakeAudioManager : public AudioManagerBase { FakeAudioManager(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream(const AudioParameters& params, const std::string& device_id) - OVERRIDE; + override; virtual AudioInputStream* MakeLowLatencyInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; protected: virtual ~FakeAudioManager(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAudioManager); diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h index f7971bf..c0fd386 100644 --- a/media/audio/fake_audio_output_stream.h +++ b/media/audio/fake_audio_output_stream.h @@ -23,12 +23,12 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream { const AudioParameters& params); // AudioOutputStream implementation. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: FakeAudioOutputStream(AudioManagerBase* manager, diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h index 8903ea3..62d0439 100644 --- a/media/audio/mac/audio_auhal_mac.h +++ b/media/audio/mac/audio_auhal_mac.h @@ -62,12 +62,12 @@ class AUHALStream : public AudioOutputStream { virtual ~AUHALStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // AUHAL callback. diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h index a6e897e..37afcee 100644 --- a/media/audio/mac/audio_input_mac.h +++ b/media/audio/mac/audio_input_mac.h @@ -29,15 +29,15 @@ class PCMQueueInAudioInputStream : public AudioInputStream { virtual ~PCMQueueInAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: // Issue the OnError to |callback_|; diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h index c8e43fa..623cf1d 100644 --- a/media/audio/mac/audio_low_latency_input_mac.h +++ b/media/audio/mac/audio_low_latency_input_mac.h @@ -65,13 +65,13 @@ class AUAudioInputStream : public AgcAudioStream<AudioInputStream> { virtual ~AUAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; // Returns the current hardware sample rate for the default input device. MEDIA_EXPORT static int HardwareSampleRate(); diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 79721d4..add37fa 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -78,7 +78,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const int num_samples = src->frames() * src->channels(); scoped_ptr<int16> interleaved(new int16[num_samples]); const int bytes_per_sample = sizeof(*interleaved); @@ -93,7 +93,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} private: media::SeekableBuffer buffer_; diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 336a8c4..809c923 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -251,12 +251,12 @@ class AudioManagerMac::AudioPowerObserver : public base::PowerObserver { } private: - virtual void OnSuspend() OVERRIDE { + virtual void OnSuspend() override { DCHECK(thread_checker_.CalledOnValidThread()); is_suspending_ = true; } - virtual void OnResume() OVERRIDE { + virtual void OnResume() override { DCHECK(thread_checker_.CalledOnValidThread()); is_suspending_ = false; earliest_start_time_ = base::TimeTicks::Now() + diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h index 490b0b6..5dd6d6e1 100644 --- a/media/audio/mac/audio_manager_mac.h +++ b/media/audio/mac/audio_manager_mac.h @@ -24,32 +24,32 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { AudioManagerMac(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; - virtual std::string GetDefaultOutputDeviceID() OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; + virtual std::string GetDefaultOutputDeviceID() override; // Used to track destruction of input and output streams. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE; - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE; + virtual void ReleaseOutputStream(AudioOutputStream* stream) override; + virtual void ReleaseInputStream(AudioInputStream* stream) override; static bool GetDefaultInputDevice(AudioDeviceID* device); static bool GetDefaultOutputDevice(AudioDeviceID* device); @@ -80,7 +80,7 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: void InitializeOnAudioThread(); diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h index 0933b508..b78b2ef 100644 --- a/media/audio/mock_audio_manager.h +++ b/media/audio/mock_audio_manager.h @@ -24,53 +24,53 @@ class MockAudioManager : public media::AudioManager { explicit MockAudioManager( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual bool HasAudioOutputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioInputDevices() override; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; + virtual base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - media::AudioDeviceNames* device_names) OVERRIDE; + media::AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - media::AudioDeviceNames* device_names) OVERRIDE; + media::AudioDeviceNames* device_names) override; virtual media::AudioOutputStream* MakeAudioOutputStream( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual media::AudioOutputStream* MakeAudioOutputStreamProxy( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual media::AudioInputStream* MakeAudioInputStream( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE; + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - OVERRIDE; + override; virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE; + virtual AudioParameters GetDefaultOutputStreamParameters() override; virtual AudioParameters GetOutputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioLogFactory::AudioComponent component) OVERRIDE; + AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() OVERRIDE; + virtual void SetHasKeyboardMic() override; protected: virtual ~MockAudioManager(); diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h index c28a2cf..6054a95 100644 --- a/media/audio/null_audio_sink.h +++ b/media/audio/null_audio_sink.h @@ -26,12 +26,12 @@ class MEDIA_EXPORT NullAudioSink // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Play() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Pause() override; + virtual void Play() override; + virtual bool SetVolume(double volume) override; // Enables audio frame hashing. Must be called prior to Initialize(). void StartAudioHashForTesting(); diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h index 53b7dfb..5bd7518 100644 --- a/media/audio/openbsd/audio_manager_openbsd.h +++ b/media/audio/openbsd/audio_manager_openbsd.h @@ -17,28 +17,28 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { AudioManagerOpenBSD(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual ~AudioManagerOpenBSD(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h index 150ea51..65462c4 100644 --- a/media/audio/pulse/audio_manager_pulse.h +++ b/media/audio/pulse/audio_manager_pulse.h @@ -22,31 +22,31 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { static AudioManager* Create(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: bool Init(); diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h index 9f08379..60acf2f 100644 --- a/media/audio/pulse/pulse_input.h +++ b/media/audio/pulse/pulse_input.h @@ -34,13 +34,13 @@ class PulseAudioInputStream : public AgcAudioStream<AudioInputStream> { virtual ~PulseAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // PulseAudio Callbacks. diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h index e1c0045..b2be95f 100644 --- a/media/audio/pulse/pulse_output.h +++ b/media/audio/pulse/pulse_output.h @@ -44,12 +44,12 @@ class PulseAudioOutputStream : public AudioOutputStream { virtual ~PulseAudioOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // Called by PulseAudio when |pa_stream_| change state. If an unexpected diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index 6c8904c..98caf28 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -28,8 +28,8 @@ class MEDIA_EXPORT SineWaveAudioSource // Implementation of AudioSourceCallback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // The number of OnMoreData() and OnError() calls respectively. int callbacks() { return callbacks_; } diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc index 6a3c16c..e57612e 100644 --- a/media/audio/sounds/audio_stream_handler.cc +++ b/media/audio/sounds/audio_stream_handler.cc @@ -105,7 +105,7 @@ class AudioStreamHandler::AudioStreamContainer // AudioOutputStream::AudioSourceCallback overrides: // Following methods could be called from *ANY* thread. virtual int OnMoreData(AudioBus* dest, - uint32 /* total_bytes_delay */) OVERRIDE { + uint32 /* total_bytes_delay */) override { base::AutoLock al(state_lock_); size_t bytes_written = 0; @@ -124,7 +124,7 @@ class AudioStreamHandler::AudioStreamContainer return dest->frames(); } - virtual void OnError(AudioOutputStream* /* stream */) OVERRIDE { + virtual void OnError(AudioOutputStream* /* stream */) override { LOG(ERROR) << "Error during system sound reproduction."; } diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc index acf472a..db4961a 100644 --- a/media/audio/sounds/audio_stream_handler_unittest.cc +++ b/media/audio/sounds/audio_stream_handler_unittest.cc @@ -24,14 +24,14 @@ class AudioStreamHandlerTest : public testing::Test { AudioStreamHandlerTest() {} virtual ~AudioStreamHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { audio_manager_.reset(AudioManager::CreateForTesting()); base::StringPiece data(kTestAudioData, arraysize(kTestAudioData)); audio_stream_handler_.reset(new AudioStreamHandler(data)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { audio_stream_handler_.reset(); audio_manager_.reset(); } diff --git a/media/audio/sounds/sounds_manager.cc b/media/audio/sounds/sounds_manager.cc index e808436..e75f3f2 100644 --- a/media/audio/sounds/sounds_manager.cc +++ b/media/audio/sounds/sounds_manager.cc @@ -28,9 +28,9 @@ class SoundsManagerImpl : public SoundsManager { // SoundsManager implementation: virtual bool Initialize(SoundKey key, - const base::StringPiece& data) OVERRIDE; - virtual bool Play(SoundKey key) OVERRIDE; - virtual base::TimeDelta GetDuration(SoundKey key) OVERRIDE; + const base::StringPiece& data) override; + virtual bool Play(SoundKey key) override; + virtual base::TimeDelta GetDuration(SoundKey key) override; private: base::hash_map<SoundKey, linked_ptr<AudioStreamHandler> > handlers_; diff --git a/media/audio/sounds/sounds_manager_unittest.cc b/media/audio/sounds/sounds_manager_unittest.cc index 78f564e..101f6a3 100644 --- a/media/audio/sounds/sounds_manager_unittest.cc +++ b/media/audio/sounds/sounds_manager_unittest.cc @@ -23,12 +23,12 @@ class SoundsManagerTest : public testing::Test { SoundsManagerTest() {} virtual ~SoundsManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { audio_manager_.reset(AudioManager::CreateForTesting()); SoundsManager::Create(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { SoundsManager::Shutdown(); audio_manager_.reset(); } diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h index d7fb11d..6caf119 100644 --- a/media/audio/sounds/test_data.h +++ b/media/audio/sounds/test_data.h @@ -28,8 +28,8 @@ class TestObserver : public AudioStreamHandler::TestObserver { virtual ~TestObserver(); // AudioStreamHandler::TestObserver implementation: - virtual void OnPlay() OVERRIDE; - virtual void OnStop(size_t cursor) OVERRIDE; + virtual void OnPlay() override; + virtual void OnStop(size_t cursor) override; int num_play_requests() const { return num_play_requests_; } int num_stop_requests() const { return num_stop_requests_; } diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h index d493022..c72a25f 100644 --- a/media/audio/test_audio_input_controller_factory.h +++ b/media/audio/test_audio_input_controller_factory.h @@ -64,10 +64,10 @@ class TestAudioInputController : public AudioInputController { EventHandler* event_handler() const { return event_handler_; } // Notifies the TestAudioControllerOpened() event to the delegate (if any). - virtual void Record() OVERRIDE; + virtual void Record() override; // Ensure that the closure is run on the audio-manager thread. - virtual void Close(const base::Closure& closed_task) OVERRIDE; + virtual void Close(const base::Closure& closed_task) override; const AudioParameters& audio_parameters() const { return audio_parameters_; @@ -101,7 +101,7 @@ class TestAudioInputControllerFactory : public AudioInputController::Factory { AudioManager* audio_manager, AudioInputController::EventHandler* event_handler, AudioParameters params, - UserInputMonitor* user_input_monitor) OVERRIDE; + UserInputMonitor* user_input_monitor) override; void set_delegate(TestAudioInputControllerDelegate* delegate) { delegate_ = delegate; diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc index f660b9c..c832a82 100644 --- a/media/audio/virtual_audio_input_stream.cc +++ b/media/audio/virtual_audio_input_stream.cc @@ -37,7 +37,7 @@ class LoopbackAudioConverter : public AudioConverter::InputCallback { private: virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE { + base::TimeDelta buffer_delay) override { audio_converter_.Convert(audio_bus); return 1.0; } diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h index 17e2730..88c92ea 100644 --- a/media/audio/virtual_audio_input_stream.h +++ b/media/audio/virtual_audio_input_stream.h @@ -47,15 +47,15 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream { virtual ~VirtualAudioInputStream(); // AudioInputStream: - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; // Attaches a VirtualAudioOutputStream to be used as input. This // VirtualAudioInputStream must outlive all attached streams, so any attached diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc index deac2ae..9256f41 100644 --- a/media/audio/virtual_audio_input_stream_unittest.cc +++ b/media/audio/virtual_audio_input_stream_unittest.cc @@ -67,7 +67,7 @@ class TestAudioSource : public SineWaveAudioSource { virtual ~TestAudioSource() {} virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { const int ret = SineWaveAudioSource::OnMoreData(audio_bus, total_bytes_delay); data_pulled_.Signal(); diff --git a/media/audio/virtual_audio_output_stream.h b/media/audio/virtual_audio_output_stream.h index 0df6d5b..c753975 100644 --- a/media/audio/virtual_audio_output_stream.h +++ b/media/audio/virtual_audio_output_stream.h @@ -37,17 +37,17 @@ class MEDIA_EXPORT VirtualAudioOutputStream virtual ~VirtualAudioOutputStream(); // AudioOutputStream: - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: // AudioConverter::InputCallback: virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; const AudioParameters params_; // Pointer to the VirtualAudioInputStream to attach to when Start() is called. diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h index 91fdde1..51feac7 100644 --- a/media/audio/win/audio_low_latency_input_win.h +++ b/media/audio/win/audio_low_latency_input_win.h @@ -95,13 +95,13 @@ class MEDIA_EXPORT WASAPIAudioInputStream virtual ~WASAPIAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; bool started() const { return started_; } @@ -110,7 +110,7 @@ class MEDIA_EXPORT WASAPIAudioInputStream private: // DelegateSimpleThread::Delegate implementation. - virtual void Run() OVERRIDE; + virtual void Run() override; // Issues the OnError() callback to the |sink_|. void HandleError(HRESULT err); diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc index 51d4b55..4a4939e 100644 --- a/media/audio/win/audio_low_latency_input_win_unittest.cc +++ b/media/audio/win/audio_low_latency_input_win_unittest.cc @@ -64,13 +64,13 @@ class FakeAudioInputCallback : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { EXPECT_NE(hardware_delay_bytes, 0u); num_received_audio_frames_ += src->frames(); data_event_.Signal(); } - virtual void OnError(AudioInputStream* stream) OVERRIDE { + virtual void OnError(AudioInputStream* stream) override { error_ = true; } diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h index c118947..1584a46 100644 --- a/media/audio/win/audio_low_latency_output_win.h +++ b/media/audio/win/audio_low_latency_output_win.h @@ -131,12 +131,12 @@ class MEDIA_EXPORT WASAPIAudioOutputStream : virtual ~WASAPIAudioOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; // Retrieves the sample rate the audio engine uses for its internal // processing/mixing of shared-mode streams. To fetch the settings for the @@ -151,7 +151,7 @@ class MEDIA_EXPORT WASAPIAudioOutputStream : private: // DelegateSimpleThread::Delegate implementation. - virtual void Run() OVERRIDE; + virtual void Run() override; // Core part of the thread loop which controls the actual rendering. // Checks available amount of space in the endpoint buffer and reads diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h index d8d5184..ce61eb6 100644 --- a/media/audio/win/audio_manager_win.h +++ b/media/audio/win/audio_manager_win.h @@ -21,37 +21,37 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase { AudioManagerWin(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual base::string16 GetAudioInputDeviceModel() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; - virtual std::string GetDefaultOutputDeviceID() OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; + virtual std::string GetDefaultOutputDeviceID() override; protected: virtual ~AudioManagerWin(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: enum EnumerationType { diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h index 5b1edd5..c587ed6 100644 --- a/media/audio/win/wavein_input_win.h +++ b/media/audio/win/wavein_input_win.h @@ -35,16 +35,16 @@ class PCMWaveInAudioInputStream : public AudioInputStream { virtual ~PCMWaveInAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; // TODO(henrika): Add volume support using the Audio Mixer API. - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: enum State { |