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

Side by Side Diff: media/audio/alsa/audio_manager_alsa.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/alsa/alsa_output_unittest.cc ('k') | media/audio/android/audio_android_unittest.cc » ('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_ALSA_AUDIO_MANAGER_ALSA_H_ 5 #ifndef MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
6 #define MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 6 #define MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "media/audio/audio_manager_base.h" 12 #include "media/audio/audio_manager_base.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 class AlsaWrapper; 16 class AlsaWrapper;
17 17
18 class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase { 18 class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase {
19 public: 19 public:
20 AudioManagerAlsa(AudioLogFactory* audio_log_factory); 20 AudioManagerAlsa(AudioLogFactory* audio_log_factory);
21 21
22 static void ShowLinuxAudioInputSettings(); 22 static void ShowLinuxAudioInputSettings();
23 23
24 // Implementation of AudioManager. 24 // Implementation of AudioManager.
25 virtual bool HasAudioOutputDevices() OVERRIDE; 25 virtual bool HasAudioOutputDevices() override;
26 virtual bool HasAudioInputDevices() OVERRIDE; 26 virtual bool HasAudioInputDevices() 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 34
35 // Implementation of AudioManagerBase. 35 // Implementation of AudioManagerBase.
36 virtual AudioOutputStream* MakeLinearOutputStream( 36 virtual AudioOutputStream* MakeLinearOutputStream(
37 const AudioParameters& params) OVERRIDE; 37 const AudioParameters& params) override;
38 virtual AudioOutputStream* MakeLowLatencyOutputStream( 38 virtual AudioOutputStream* MakeLowLatencyOutputStream(
39 const AudioParameters& params, 39 const AudioParameters& params,
40 const std::string& device_id) OVERRIDE; 40 const std::string& device_id) override;
41 virtual AudioInputStream* MakeLinearInputStream( 41 virtual AudioInputStream* MakeLinearInputStream(
42 const AudioParameters& params, const std::string& device_id) OVERRIDE; 42 const AudioParameters& params, const std::string& device_id) override;
43 virtual AudioInputStream* MakeLowLatencyInputStream( 43 virtual AudioInputStream* MakeLowLatencyInputStream(
44 const AudioParameters& params, const std::string& device_id) OVERRIDE; 44 const AudioParameters& params, const std::string& device_id) override;
45 45
46 protected: 46 protected:
47 virtual ~AudioManagerAlsa(); 47 virtual ~AudioManagerAlsa();
48 48
49 virtual AudioParameters GetPreferredOutputStreamParameters( 49 virtual AudioParameters GetPreferredOutputStreamParameters(
50 const std::string& output_device_id, 50 const std::string& output_device_id,
51 const AudioParameters& input_params) OVERRIDE; 51 const AudioParameters& input_params) override;
52 52
53 private: 53 private:
54 enum StreamType { 54 enum StreamType {
55 kStreamPlayback = 0, 55 kStreamPlayback = 0,
56 kStreamCapture, 56 kStreamCapture,
57 }; 57 };
58 58
59 // Gets a list of available ALSA devices. 59 // Gets a list of available ALSA devices.
60 void GetAlsaAudioDevices(StreamType type, 60 void GetAlsaAudioDevices(StreamType type,
61 media::AudioDeviceNames* device_names); 61 media::AudioDeviceNames* device_names);
(...skipping 22 matching lines...) Expand all
84 const std::string& device_id); 84 const std::string& device_id);
85 85
86 scoped_ptr<AlsaWrapper> wrapper_; 86 scoped_ptr<AlsaWrapper> wrapper_;
87 87
88 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa); 88 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa);
89 }; 89 };
90 90
91 } // namespace media 91 } // namespace media
92 92
93 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 93 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
OLDNEW
« no previous file with comments | « media/audio/alsa/alsa_output_unittest.cc ('k') | media/audio/android/audio_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698