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

Side by Side Diff: media/midi/midi_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/formats/webm/webm_video_client.h ('k') | media/midi/midi_manager_mac.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_MIDI_MIDI_MANAGER_ALSA_H_ 5 #ifndef MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
6 #define MEDIA_MIDI_MIDI_MANAGER_ALSA_H_ 6 #define MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
7 7
8 #include <alsa/asoundlib.h> 8 #include <alsa/asoundlib.h>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "media/midi/midi_manager.h" 16 #include "media/midi/midi_manager.h"
17 17
18 namespace media { 18 namespace media {
19 19
20 class MidiManagerAlsa : public MidiManager { 20 class MidiManagerAlsa : public MidiManager {
21 public: 21 public:
22 MidiManagerAlsa(); 22 MidiManagerAlsa();
23 virtual ~MidiManagerAlsa(); 23 virtual ~MidiManagerAlsa();
24 24
25 // MidiManager implementation. 25 // MidiManager implementation.
26 virtual void StartInitialization() OVERRIDE; 26 virtual void StartInitialization() override;
27 virtual void DispatchSendMidiData(MidiManagerClient* client, 27 virtual void DispatchSendMidiData(MidiManagerClient* client,
28 uint32 port_index, 28 uint32 port_index,
29 const std::vector<uint8>& data, 29 const std::vector<uint8>& data,
30 double timestamp) OVERRIDE; 30 double timestamp) override;
31 31
32 private: 32 private:
33 // An internal callback that runs on MidiSendThread. 33 // An internal callback that runs on MidiSendThread.
34 void SendMidiData(uint32 port_index, 34 void SendMidiData(uint32 port_index,
35 const std::vector<uint8>& data); 35 const std::vector<uint8>& data);
36 36
37 void EventReset(); 37 void EventReset();
38 void EventLoop(); 38 void EventLoop();
39 39
40 // Alsa seq handles. 40 // Alsa seq handles.
(...skipping 19 matching lines...) Expand all
60 60
61 bool event_thread_shutdown_; // guarded by shutdown_lock_ 61 bool event_thread_shutdown_; // guarded by shutdown_lock_
62 base::Lock shutdown_lock_; // guards event_thread_shutdown_ 62 base::Lock shutdown_lock_; // guards event_thread_shutdown_
63 63
64 DISALLOW_COPY_AND_ASSIGN(MidiManagerAlsa); 64 DISALLOW_COPY_AND_ASSIGN(MidiManagerAlsa);
65 }; 65 };
66 66
67 } // namespace media 67 } // namespace media
68 68
69 #endif // MEDIA_MIDI_MIDI_MANAGER_ALSA_H_ 69 #endif // MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_video_client.h ('k') | media/midi/midi_manager_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698