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

Side by Side Diff: media/audio/cras/cras_input.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/cras/audio_manager_cras.h ('k') | media/audio/cras/cras_input_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_CRAS_CRAS_INPUT_H_ 5 #ifndef MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
6 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ 6 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
7 7
8 #include <cras_client.h> 8 #include <cras_client.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 15 matching lines...) Expand all
26 // The ctor takes all the usual parameters, plus |manager| which is the 26 // The ctor takes all the usual parameters, plus |manager| which is the
27 // audio manager who is creating this object. 27 // audio manager who is creating this object.
28 CrasInputStream(const AudioParameters& params, AudioManagerCras* manager, 28 CrasInputStream(const AudioParameters& params, AudioManagerCras* manager,
29 const std::string& device_id); 29 const std::string& device_id);
30 30
31 // The dtor is typically called by the AudioManager only and it is usually 31 // The dtor is typically called by the AudioManager only and it is usually
32 // triggered by calling AudioOutputStream::Close(). 32 // triggered by calling AudioOutputStream::Close().
33 virtual ~CrasInputStream(); 33 virtual ~CrasInputStream();
34 34
35 // Implementation of AudioInputStream. 35 // Implementation of AudioInputStream.
36 virtual bool Open() OVERRIDE; 36 virtual bool Open() override;
37 virtual void Start(AudioInputCallback* callback) OVERRIDE; 37 virtual void Start(AudioInputCallback* callback) override;
38 virtual void Stop() OVERRIDE; 38 virtual void Stop() override;
39 virtual void Close() OVERRIDE; 39 virtual void Close() override;
40 virtual double GetMaxVolume() OVERRIDE; 40 virtual double GetMaxVolume() override;
41 virtual void SetVolume(double volume) OVERRIDE; 41 virtual void SetVolume(double volume) override;
42 virtual double GetVolume() OVERRIDE; 42 virtual double GetVolume() override;
43 43
44 private: 44 private:
45 // Handles requests to get samples from the provided buffer. This will be 45 // Handles requests to get samples from the provided buffer. This will be
46 // called by the audio server when it has samples ready. 46 // called by the audio server when it has samples ready.
47 static int SamplesReady(cras_client* client, 47 static int SamplesReady(cras_client* client,
48 cras_stream_id_t stream_id, 48 cras_stream_id_t stream_id,
49 uint8* samples, 49 uint8* samples,
50 size_t frames, 50 size_t frames,
51 const timespec* sample_ts, 51 const timespec* sample_ts,
52 void* arg); 52 void* arg);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 const CRAS_STREAM_DIRECTION stream_direction_; 99 const CRAS_STREAM_DIRECTION stream_direction_;
100 100
101 scoped_ptr<AudioBus> audio_bus_; 101 scoped_ptr<AudioBus> audio_bus_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(CrasInputStream); 103 DISALLOW_COPY_AND_ASSIGN(CrasInputStream);
104 }; 104 };
105 105
106 } // namespace media 106 } // namespace media
107 107
108 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ 108 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/cras/cras_input_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698