Chromium Code Reviews| 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 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 manufacturer = SysCFStringRefToUTF8(manufacturer_ref); | 44 manufacturer = SysCFStringRefToUTF8(manufacturer_ref); |
| 45 } else { | 45 } else { |
| 46 // kMIDIPropertyManufacturer is not supported in IAC driver providing | 46 // kMIDIPropertyManufacturer is not supported in IAC driver providing |
| 47 // endpoints, and the result will be kMIDIUnknownProperty (-10835). | 47 // endpoints, and the result will be kMIDIUnknownProperty (-10835). |
| 48 DLOG(WARNING) << "Failed to get kMIDIPropertyManufacturer with status " | 48 DLOG(WARNING) << "Failed to get kMIDIPropertyManufacturer with status " |
| 49 << result; | 49 << result; |
| 50 } | 50 } |
| 51 | 51 |
| 52 string name; | 52 string name; |
| 53 CFStringRef name_ref = NULL; | 53 CFStringRef name_ref = NULL; |
| 54 result = MIDIObjectGetStringProperty(endpoint, kMIDIPropertyName, &name_ref); | 54 result = MIDIObjectGetStringProperty(endpoint, kMIDIPropertyDisplayName, |
|
Takashi Toyoshima
2015/03/24 05:11:59
This is available on Core MIDI 1.5 and laters.
Can
| |
| 55 &name_ref); | |
| 55 if (result == noErr) | 56 if (result == noErr) |
| 56 name = SysCFStringRefToUTF8(name_ref); | 57 name = SysCFStringRefToUTF8(name_ref); |
| 57 else | 58 else |
| 58 DLOG(WARNING) << "Failed to get kMIDIPropertyName with status " << result; | 59 DLOG(WARNING) << "Failed to get kMIDIPropertyDisplayName with status " |
| 60 << result; | |
| 59 | 61 |
| 60 string version; | 62 string version; |
| 61 SInt32 version_number = 0; | 63 SInt32 version_number = 0; |
| 62 result = MIDIObjectGetIntegerProperty( | 64 result = MIDIObjectGetIntegerProperty( |
| 63 endpoint, kMIDIPropertyDriverVersion, &version_number); | 65 endpoint, kMIDIPropertyDriverVersion, &version_number); |
| 64 if (result == noErr) { | 66 if (result == noErr) { |
| 65 version = IntToString(version_number); | 67 version = IntToString(version_number); |
| 66 } else { | 68 } else { |
| 67 // kMIDIPropertyDriverVersion is not supported in IAC driver providing | 69 // kMIDIPropertyDriverVersion is not supported in IAC driver providing |
| 68 // endpoints, and the result will be kMIDIUnknownProperty (-10835). | 70 // endpoints, and the result will be kMIDIUnknownProperty (-10835). |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 &data[sent_size]); | 354 &data[sent_size]); |
| 353 DCHECK(midi_packet); | 355 DCHECK(midi_packet); |
| 354 | 356 |
| 355 MIDISend(coremidi_output_, destination, packet_list); | 357 MIDISend(coremidi_output_, destination, packet_list); |
| 356 } | 358 } |
| 357 | 359 |
| 358 client->AccumulateMidiBytesSent(data.size()); | 360 client->AccumulateMidiBytesSent(data.size()); |
| 359 } | 361 } |
| 360 | 362 |
| 361 } // namespace media | 363 } // namespace media |
| OLD | NEW |