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

Side by Side Diff: media/audio/cras/audio_manager_cras.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/clockless_audio_sink.cc ('k') | media/audio/cras/cras_input.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CRAS_AUDIO_MANAGER_CRAS_H_ 5 #ifndef MEDIA_AUDIO_CRAS_AUDIO_MANAGER_CRAS_H_
6 #define MEDIA_AUDIO_CRAS_AUDIO_MANAGER_CRAS_H_ 6 #define MEDIA_AUDIO_CRAS_AUDIO_MANAGER_CRAS_H_
7 7
8 #include <cras_types.h> 8 #include <cras_types.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "media/audio/audio_manager_base.h" 14 #include "media/audio/audio_manager_base.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { 18 class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase {
19 public: 19 public:
20 AudioManagerCras(AudioLogFactory* audio_log_factory); 20 AudioManagerCras(AudioLogFactory* audio_log_factory);
21 21
22 // AudioManager implementation. 22 // AudioManager implementation.
23 virtual bool HasAudioOutputDevices() OVERRIDE; 23 virtual bool HasAudioOutputDevices() override;
24 virtual bool HasAudioInputDevices() OVERRIDE; 24 virtual bool HasAudioInputDevices() override;
25 virtual void ShowAudioInputSettings() OVERRIDE; 25 virtual void ShowAudioInputSettings() override;
26 virtual void GetAudioInputDeviceNames( 26 virtual void GetAudioInputDeviceNames(
27 AudioDeviceNames* device_names) OVERRIDE; 27 AudioDeviceNames* device_names) override;
28 virtual void GetAudioOutputDeviceNames( 28 virtual void GetAudioOutputDeviceNames(
29 AudioDeviceNames* device_names) OVERRIDE; 29 AudioDeviceNames* device_names) override;
30 virtual AudioParameters GetInputStreamParameters( 30 virtual AudioParameters GetInputStreamParameters(
31 const std::string& device_id) OVERRIDE; 31 const std::string& device_id) override;
32 virtual void SetHasKeyboardMic() OVERRIDE; 32 virtual void SetHasKeyboardMic() override;
33 33
34 // AudioManagerBase implementation. 34 // AudioManagerBase implementation.
35 virtual AudioOutputStream* MakeLinearOutputStream( 35 virtual AudioOutputStream* MakeLinearOutputStream(
36 const AudioParameters& params) OVERRIDE; 36 const AudioParameters& params) override;
37 virtual AudioOutputStream* MakeLowLatencyOutputStream( 37 virtual AudioOutputStream* MakeLowLatencyOutputStream(
38 const AudioParameters& params, 38 const AudioParameters& params,
39 const std::string& device_id) OVERRIDE; 39 const std::string& device_id) override;
40 virtual AudioInputStream* MakeLinearInputStream( 40 virtual AudioInputStream* MakeLinearInputStream(
41 const AudioParameters& params, const std::string& device_id) OVERRIDE; 41 const AudioParameters& params, const std::string& device_id) override;
42 virtual AudioInputStream* MakeLowLatencyInputStream( 42 virtual AudioInputStream* MakeLowLatencyInputStream(
43 const AudioParameters& params, const std::string& device_id) OVERRIDE; 43 const AudioParameters& params, const std::string& device_id) override;
44 44
45 static snd_pcm_format_t BitsToFormat(int bits_per_sample); 45 static snd_pcm_format_t BitsToFormat(int bits_per_sample);
46 46
47 protected: 47 protected:
48 virtual ~AudioManagerCras(); 48 virtual ~AudioManagerCras();
49 49
50 virtual AudioParameters GetPreferredOutputStreamParameters( 50 virtual AudioParameters GetPreferredOutputStreamParameters(
51 const std::string& output_device_id, 51 const std::string& output_device_id,
52 const AudioParameters& input_params) OVERRIDE; 52 const AudioParameters& input_params) override;
53 53
54 private: 54 private:
55 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. 55 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
56 AudioOutputStream* MakeOutputStream(const AudioParameters& params); 56 AudioOutputStream* MakeOutputStream(const AudioParameters& params);
57 57
58 // Called by MakeLinearInputStream and MakeLowLatencyInputStream. 58 // Called by MakeLinearInputStream and MakeLowLatencyInputStream.
59 AudioInputStream* MakeInputStream(const AudioParameters& params, 59 AudioInputStream* MakeInputStream(const AudioParameters& params,
60 const std::string& device_id); 60 const std::string& device_id);
61 61
62 bool has_keyboard_mic_; 62 bool has_keyboard_mic_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(AudioManagerCras); 64 DISALLOW_COPY_AND_ASSIGN(AudioManagerCras);
65 }; 65 };
66 66
67 } // namespace media 67 } // namespace media
68 68
69 #endif // MEDIA_AUDIO_CRAS_AUDIO_MANAGER_CRAS_H_ 69 #endif // MEDIA_AUDIO_CRAS_AUDIO_MANAGER_CRAS_H_
OLDNEW
« no previous file with comments | « media/audio/clockless_audio_sink.cc ('k') | media/audio/cras/cras_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698