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

Side by Side Diff: media/audio/pulse/pulse_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/pulse/audio_manager_pulse.h ('k') | media/audio/pulse/pulse_output.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_PULSE_PULSE_INPUT_H_ 5 #ifndef MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
6 #define MEDIA_AUDIO_PULSE_PULSE_INPUT_H_ 6 #define MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/threading/thread_checker.h" 10 #include "base/threading/thread_checker.h"
(...skipping 16 matching lines...) Expand all
27 public: 27 public:
28 PulseAudioInputStream(AudioManagerPulse* audio_manager, 28 PulseAudioInputStream(AudioManagerPulse* audio_manager,
29 const std::string& device_name, 29 const std::string& device_name,
30 const AudioParameters& params, 30 const AudioParameters& params,
31 pa_threaded_mainloop* mainloop, 31 pa_threaded_mainloop* mainloop,
32 pa_context* context); 32 pa_context* context);
33 33
34 virtual ~PulseAudioInputStream(); 34 virtual ~PulseAudioInputStream();
35 35
36 // Implementation of AudioInputStream. 36 // Implementation of AudioInputStream.
37 virtual bool Open() OVERRIDE; 37 virtual bool Open() override;
38 virtual void Start(AudioInputCallback* callback) OVERRIDE; 38 virtual void Start(AudioInputCallback* callback) override;
39 virtual void Stop() OVERRIDE; 39 virtual void Stop() override;
40 virtual void Close() OVERRIDE; 40 virtual void Close() override;
41 virtual double GetMaxVolume() OVERRIDE; 41 virtual double GetMaxVolume() override;
42 virtual void SetVolume(double volume) OVERRIDE; 42 virtual void SetVolume(double volume) override;
43 virtual double GetVolume() OVERRIDE; 43 virtual double GetVolume() override;
44 44
45 private: 45 private:
46 // PulseAudio Callbacks. 46 // PulseAudio Callbacks.
47 static void ReadCallback(pa_stream* handle, size_t length, void* user_data); 47 static void ReadCallback(pa_stream* handle, size_t length, void* user_data);
48 static void StreamNotifyCallback(pa_stream* stream, void* user_data); 48 static void StreamNotifyCallback(pa_stream* stream, void* user_data);
49 static void VolumeCallback(pa_context* context, const pa_source_info* info, 49 static void VolumeCallback(pa_context* context, const pa_source_info* info,
50 int error, void* user_data); 50 int error, void* user_data);
51 51
52 // Helper for the ReadCallback. 52 // Helper for the ReadCallback.
53 void ReadData(); 53 void ReadData();
(...skipping 18 matching lines...) Expand all
72 bool context_state_changed_; 72 bool context_state_changed_;
73 73
74 base::ThreadChecker thread_checker_; 74 base::ThreadChecker thread_checker_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream); 76 DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream);
77 }; 77 };
78 78
79 } // namespace media 79 } // namespace media
80 80
81 #endif // MEDIA_AUDIO_PULSE_PULSE_INPUT_H_ 81 #endif // MEDIA_AUDIO_PULSE_PULSE_INPUT_H_
OLDNEW
« no previous file with comments | « media/audio/pulse/audio_manager_pulse.h ('k') | media/audio/pulse/pulse_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698