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

Side by Side Diff: media/audio/audio_output_proxy.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/audio_output_dispatcher_impl.h ('k') | media/audio/audio_output_proxy_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 (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_AUDIO_OUTPUT_PROXY_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
6 #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ 6 #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
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"
(...skipping 14 matching lines...) Expand all
25 // AudioOutputProxy uses AudioOutputDispatcher to open and close 25 // AudioOutputProxy uses AudioOutputDispatcher to open and close
26 // physical output streams. 26 // physical output streams.
27 class MEDIA_EXPORT AudioOutputProxy 27 class MEDIA_EXPORT AudioOutputProxy
28 : public AudioOutputStream, 28 : public AudioOutputStream,
29 public NON_EXPORTED_BASE(base::NonThreadSafe) { 29 public NON_EXPORTED_BASE(base::NonThreadSafe) {
30 public: 30 public:
31 // Caller keeps ownership of |dispatcher|. 31 // Caller keeps ownership of |dispatcher|.
32 explicit AudioOutputProxy(AudioOutputDispatcher* dispatcher); 32 explicit AudioOutputProxy(AudioOutputDispatcher* dispatcher);
33 33
34 // AudioOutputStream interface. 34 // AudioOutputStream interface.
35 virtual bool Open() OVERRIDE; 35 virtual bool Open() override;
36 virtual void Start(AudioSourceCallback* callback) OVERRIDE; 36 virtual void Start(AudioSourceCallback* callback) override;
37 virtual void Stop() OVERRIDE; 37 virtual void Stop() override;
38 virtual void SetVolume(double volume) OVERRIDE; 38 virtual void SetVolume(double volume) override;
39 virtual void GetVolume(double* volume) OVERRIDE; 39 virtual void GetVolume(double* volume) override;
40 virtual void Close() OVERRIDE; 40 virtual void Close() override;
41 41
42 private: 42 private:
43 enum State { 43 enum State {
44 kCreated, 44 kCreated,
45 kOpened, 45 kOpened,
46 kPlaying, 46 kPlaying,
47 kClosed, 47 kClosed,
48 kOpenError, 48 kOpenError,
49 kStartError, 49 kStartError,
50 }; 50 };
51 51
52 virtual ~AudioOutputProxy(); 52 virtual ~AudioOutputProxy();
53 53
54 scoped_refptr<AudioOutputDispatcher> dispatcher_; 54 scoped_refptr<AudioOutputDispatcher> dispatcher_;
55 State state_; 55 State state_;
56 56
57 // Need to save volume here, so that we can restore it in case the stream 57 // Need to save volume here, so that we can restore it in case the stream
58 // is stopped, and then started again. 58 // is stopped, and then started again.
59 double volume_; 59 double volume_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(AudioOutputProxy); 61 DISALLOW_COPY_AND_ASSIGN(AudioOutputProxy);
62 }; 62 };
63 63
64 } // namespace media 64 } // namespace media
65 65
66 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ 66 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_dispatcher_impl.h ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698