summaryrefslogtreecommitdiffstats
path: root/media/audio/win
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 18:04:44 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 01:05:52 +0000
commit2da2112cb906481f3c280a2b4fac2927619d6df0 (patch)
tree2da9215cd888cc4ca935d36376d59bc6f0bdab3d /media/audio/win
parent886aeccd3824618309ccce5eabb2a70241073bc9 (diff)
downloadchromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.zip
chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.gz
chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.bz2
replace OVERRIDE and FINAL with override and final in media/
BUG=417463 Review URL: https://codereview.chromium.org/623263003 Cr-Commit-Position: refs/heads/master@{#298317}
Diffstat (limited to 'media/audio/win')
-rw-r--r--media/audio/win/audio_low_latency_input_win.h16
-rw-r--r--media/audio/win/audio_low_latency_input_win_unittest.cc4
-rw-r--r--media/audio/win/audio_low_latency_output_win.h14
-rw-r--r--media/audio/win/audio_manager_win.h28
-rw-r--r--media/audio/win/wavein_input_win.h18
5 files changed, 40 insertions, 40 deletions
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 {