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

Side by Side Diff: media/audio/null_audio_sink.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/mock_audio_manager.h ('k') | media/audio/openbsd/audio_manager_openbsd.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_NULL_AUDIO_SINK_H_ 5 #ifndef MEDIA_AUDIO_NULL_AUDIO_SINK_H_
6 #define MEDIA_AUDIO_NULL_AUDIO_SINK_H_ 6 #define MEDIA_AUDIO_NULL_AUDIO_SINK_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "media/base/audio_renderer_sink.h" 11 #include "media/base/audio_renderer_sink.h"
12 12
13 namespace base { 13 namespace base {
14 class SingleThreadTaskRunner; 14 class SingleThreadTaskRunner;
15 } 15 }
16 16
17 namespace media { 17 namespace media {
18 class AudioBus; 18 class AudioBus;
19 class AudioHash; 19 class AudioHash;
20 class FakeAudioConsumer; 20 class FakeAudioConsumer;
21 21
22 class MEDIA_EXPORT NullAudioSink 22 class MEDIA_EXPORT NullAudioSink
23 : NON_EXPORTED_BASE(public AudioRendererSink) { 23 : NON_EXPORTED_BASE(public AudioRendererSink) {
24 public: 24 public:
25 NullAudioSink(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 25 NullAudioSink(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
26 26
27 // AudioRendererSink implementation. 27 // AudioRendererSink implementation.
28 virtual void Initialize(const AudioParameters& params, 28 virtual void Initialize(const AudioParameters& params,
29 RenderCallback* callback) OVERRIDE; 29 RenderCallback* callback) override;
30 virtual void Start() OVERRIDE; 30 virtual void Start() override;
31 virtual void Stop() OVERRIDE; 31 virtual void Stop() override;
32 virtual void Pause() OVERRIDE; 32 virtual void Pause() override;
33 virtual void Play() OVERRIDE; 33 virtual void Play() override;
34 virtual bool SetVolume(double volume) OVERRIDE; 34 virtual bool SetVolume(double volume) override;
35 35
36 // Enables audio frame hashing. Must be called prior to Initialize(). 36 // Enables audio frame hashing. Must be called prior to Initialize().
37 void StartAudioHashForTesting(); 37 void StartAudioHashForTesting();
38 38
39 // Returns the hash of all audio frames seen since construction. 39 // Returns the hash of all audio frames seen since construction.
40 std::string GetAudioHashForTesting(); 40 std::string GetAudioHashForTesting();
41 41
42 protected: 42 protected:
43 virtual ~NullAudioSink(); 43 virtual ~NullAudioSink();
44 44
(...skipping 10 matching lines...) Expand all
55 55
56 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 56 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
57 scoped_ptr<FakeAudioConsumer> fake_consumer_; 57 scoped_ptr<FakeAudioConsumer> fake_consumer_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(NullAudioSink); 59 DISALLOW_COPY_AND_ASSIGN(NullAudioSink);
60 }; 60 };
61 61
62 } // namespace media 62 } // namespace media
63 63
64 #endif // MEDIA_AUDIO_NULL_AUDIO_SINK_H_ 64 #endif // MEDIA_AUDIO_NULL_AUDIO_SINK_H_
OLDNEW
« no previous file with comments | « media/audio/mock_audio_manager.h ('k') | media/audio/openbsd/audio_manager_openbsd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698