OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_mac.h" | 5 #include "media/midi/midi_manager_mac.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "base/single_thread_task_runner.h" |
11 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/sys_string_conversions.h" | 13 #include "base/strings/sys_string_conversions.h" |
13 | 14 |
14 #include <CoreAudio/HostTime.h> | 15 #include <CoreAudio/HostTime.h> |
15 #include <stddef.h> | 16 #include <stddef.h> |
16 | 17 |
17 using base::IntToString; | 18 using base::IntToString; |
18 using base::SysCFStringRefToUTF8; | 19 using base::SysCFStringRefToUTF8; |
19 using std::string; | 20 using std::string; |
20 | 21 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 base::Unretained(this), client, port_index, data, timestamp)); | 146 base::Unretained(this), client, port_index, data, timestamp)); |
146 } | 147 } |
147 | 148 |
148 void MidiManagerMac::RunOnClientThread(const base::Closure& closure) { | 149 void MidiManagerMac::RunOnClientThread(const base::Closure& closure) { |
149 if (shutdown_) | 150 if (shutdown_) |
150 return; | 151 return; |
151 | 152 |
152 if (!client_thread_.IsRunning()) | 153 if (!client_thread_.IsRunning()) |
153 client_thread_.Start(); | 154 client_thread_.Start(); |
154 | 155 |
155 client_thread_.message_loop()->PostTask(FROM_HERE, closure); | 156 client_thread_.task_runner()->PostTask(FROM_HERE, closure); |
156 } | 157 } |
157 | 158 |
158 void MidiManagerMac::InitializeCoreMIDI() { | 159 void MidiManagerMac::InitializeCoreMIDI() { |
159 DCHECK(client_thread_.task_runner()->BelongsToCurrentThread()); | 160 DCHECK(client_thread_.task_runner()->BelongsToCurrentThread()); |
160 | 161 |
161 // CoreMIDI registration. | 162 // CoreMIDI registration. |
162 DCHECK_EQ(0u, midi_client_); | 163 DCHECK_EQ(0u, midi_client_); |
163 OSStatus result = | 164 OSStatus result = |
164 MIDIClientCreate(CFSTR("Chrome"), ReceiveMidiNotifyDispatch, this, | 165 MIDIClientCreate(CFSTR("Chrome"), ReceiveMidiNotifyDispatch, this, |
165 &midi_client_); | 166 &midi_client_); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 DCHECK(midi_packet); | 381 DCHECK(midi_packet); |
381 | 382 |
382 MIDISend(coremidi_output_, destination, packet_list); | 383 MIDISend(coremidi_output_, destination, packet_list); |
383 } | 384 } |
384 | 385 |
385 AccumulateMidiBytesSent(client, data.size()); | 386 AccumulateMidiBytesSent(client, data.size()); |
386 } | 387 } |
387 | 388 |
388 } // namespace midi | 389 } // namespace midi |
389 } // namespace media | 390 } // namespace media |
OLD | NEW |