Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Side by Side Diff: media/audio/win/audio_manager_win.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/win/audio_low_latency_output_win.h ('k') | media/audio/win/wavein_input_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 5 #ifndef MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 6 #define MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/audio/audio_manager_base.h" 10 #include "media/audio/audio_manager_base.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 class AudioDeviceListenerWin; 14 class AudioDeviceListenerWin;
15 15
16 // Windows implementation of the AudioManager singleton. This class is internal 16 // Windows implementation of the AudioManager singleton. This class is internal
17 // to the audio output and only internal users can call methods not exposed by 17 // to the audio output and only internal users can call methods not exposed by
18 // the AudioManager class. 18 // the AudioManager class.
19 class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase { 19 class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
20 public: 20 public:
21 AudioManagerWin(AudioLogFactory* audio_log_factory); 21 AudioManagerWin(AudioLogFactory* audio_log_factory);
22 22
23 // Implementation of AudioManager. 23 // Implementation of AudioManager.
24 virtual bool HasAudioOutputDevices() OVERRIDE; 24 virtual bool HasAudioOutputDevices() override;
25 virtual bool HasAudioInputDevices() OVERRIDE; 25 virtual bool HasAudioInputDevices() override;
26 virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; 26 virtual base::string16 GetAudioInputDeviceModel() override;
27 virtual void ShowAudioInputSettings() OVERRIDE; 27 virtual void ShowAudioInputSettings() override;
28 virtual void GetAudioInputDeviceNames( 28 virtual void GetAudioInputDeviceNames(
29 AudioDeviceNames* device_names) OVERRIDE; 29 AudioDeviceNames* device_names) override;
30 virtual void GetAudioOutputDeviceNames( 30 virtual void GetAudioOutputDeviceNames(
31 AudioDeviceNames* device_names) OVERRIDE; 31 AudioDeviceNames* device_names) override;
32 virtual AudioParameters GetInputStreamParameters( 32 virtual AudioParameters GetInputStreamParameters(
33 const std::string& device_id) OVERRIDE; 33 const std::string& device_id) override;
34 virtual std::string GetAssociatedOutputDeviceID( 34 virtual std::string GetAssociatedOutputDeviceID(
35 const std::string& input_device_id) OVERRIDE; 35 const std::string& input_device_id) override;
36 36
37 // Implementation of AudioManagerBase. 37 // Implementation of AudioManagerBase.
38 virtual AudioOutputStream* MakeLinearOutputStream( 38 virtual AudioOutputStream* MakeLinearOutputStream(
39 const AudioParameters& params) OVERRIDE; 39 const AudioParameters& params) override;
40 virtual AudioOutputStream* MakeLowLatencyOutputStream( 40 virtual AudioOutputStream* MakeLowLatencyOutputStream(
41 const AudioParameters& params, 41 const AudioParameters& params,
42 const std::string& device_id) OVERRIDE; 42 const std::string& device_id) override;
43 virtual AudioInputStream* MakeLinearInputStream( 43 virtual AudioInputStream* MakeLinearInputStream(
44 const AudioParameters& params, const std::string& device_id) OVERRIDE; 44 const AudioParameters& params, const std::string& device_id) override;
45 virtual AudioInputStream* MakeLowLatencyInputStream( 45 virtual AudioInputStream* MakeLowLatencyInputStream(
46 const AudioParameters& params, const std::string& device_id) OVERRIDE; 46 const AudioParameters& params, const std::string& device_id) override;
47 virtual std::string GetDefaultOutputDeviceID() OVERRIDE; 47 virtual std::string GetDefaultOutputDeviceID() override;
48 48
49 protected: 49 protected:
50 virtual ~AudioManagerWin(); 50 virtual ~AudioManagerWin();
51 51
52 virtual AudioParameters GetPreferredOutputStreamParameters( 52 virtual AudioParameters GetPreferredOutputStreamParameters(
53 const std::string& output_device_id, 53 const std::string& output_device_id,
54 const AudioParameters& input_params) OVERRIDE; 54 const AudioParameters& input_params) override;
55 55
56 private: 56 private:
57 enum EnumerationType { 57 enum EnumerationType {
58 kMMDeviceEnumeration, 58 kMMDeviceEnumeration,
59 kWaveEnumeration, 59 kWaveEnumeration,
60 }; 60 };
61 61
62 // Allow unit test to modify the utilized enumeration API. 62 // Allow unit test to modify the utilized enumeration API.
63 friend class AudioManagerTest; 63 friend class AudioManagerTest;
64 64
(...skipping 25 matching lines...) Expand all
90 90
91 // Listen for output device changes. 91 // Listen for output device changes.
92 scoped_ptr<AudioDeviceListenerWin> output_device_listener_; 92 scoped_ptr<AudioDeviceListenerWin> output_device_listener_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin); 94 DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
95 }; 95 };
96 96
97 } // namespace media 97 } // namespace media
98 98
99 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_ 99 #endif // MEDIA_AUDIO_WIN_AUDIO_MANAGER_WIN_H_
OLDNEW
« no previous file with comments | « media/audio/win/audio_low_latency_output_win.h ('k') | media/audio/win/wavein_input_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698