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

Side by Side Diff: media/midi/midi_manager_usb.cc

Issue 2262043002: MidiScheduler binds to task runner of constructing thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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/midi/midi_manager_usb.h ('k') | media/midi/midi_scheduler.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 #include "media/midi/midi_manager_usb.h" 5 #include "media/midi/midi_manager_usb.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "media/midi/midi_scheduler.h" 12 #include "media/midi/midi_scheduler.h"
13 #include "media/midi/usb_midi_descriptor_parser.h" 13 #include "media/midi/usb_midi_descriptor_parser.h"
14 14
15 namespace media { 15 namespace media {
16 namespace midi { 16 namespace midi {
17 17
18 MidiManagerUsb::MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory> factory) 18 MidiManagerUsb::MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory> factory)
19 : device_factory_(std::move(factory)) {} 19 : device_factory_(std::move(factory)) {}
20 20
21 MidiManagerUsb::~MidiManagerUsb() { 21 MidiManagerUsb::~MidiManagerUsb() {
22 base::AutoLock auto_lock(scheduler_lock_);
23 CHECK(!scheduler_);
22 } 24 }
23 25
24 void MidiManagerUsb::StartInitialization() { 26 void MidiManagerUsb::StartInitialization() {
25 Initialize( 27 Initialize(
26 base::Bind(&MidiManager::CompleteInitialization, base::Unretained(this))); 28 base::Bind(&MidiManager::CompleteInitialization, base::Unretained(this)));
27 } 29 }
28 30
31 void MidiManagerUsb::Finalize() {
32 // Destruct MidiScheduler on Chrome_IOThread.
33 base::AutoLock auto_lock(scheduler_lock_);
34 scheduler_.reset();
35 }
36
29 void MidiManagerUsb::Initialize(base::Callback<void(Result result)> callback) { 37 void MidiManagerUsb::Initialize(base::Callback<void(Result result)> callback) {
30 initialize_callback_ = callback; 38 initialize_callback_ = callback;
31 scheduler_.reset(new MidiScheduler(this)); 39
40 {
41 base::AutoLock auto_lock(scheduler_lock_);
42 scheduler_.reset(new MidiScheduler(this));
43 }
44
32 // This is safe because EnumerateDevices cancels the operation on destruction. 45 // This is safe because EnumerateDevices cancels the operation on destruction.
33 device_factory_->EnumerateDevices( 46 device_factory_->EnumerateDevices(
34 this, 47 this,
35 base::Bind(&MidiManagerUsb::OnEnumerateDevicesDone, 48 base::Bind(&MidiManagerUsb::OnEnumerateDevicesDone,
36 base::Unretained(this))); 49 base::Unretained(this)));
37 } 50 }
38 51
39 void MidiManagerUsb::DispatchSendMidiData(MidiManagerClient* client, 52 void MidiManagerUsb::DispatchSendMidiData(MidiManagerClient* client,
40 uint32_t port_index, 53 uint32_t port_index,
41 const std::vector<uint8_t>& data, 54 const std::vector<uint8_t>& data,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 input_stream_->Add(jacks[j]); 161 input_stream_->Add(jacks[j]);
149 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version, 162 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version,
150 MIDI_PORT_OPENED)); 163 MIDI_PORT_OPENED));
151 } 164 }
152 } 165 }
153 return true; 166 return true;
154 } 167 }
155 168
156 } // namespace midi 169 } // namespace midi
157 } // namespace media 170 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698