Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 11:35:24 +01:00
Code Issues Releases Wiki Activity

Get address and bus number of MTP devices on Mac.

Browse Source
This commit is contained in:
John Maguire 2010-09-02 18:10:40 +00:00
parent 29464bccfe
commit 310fa00701
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/devices/macdevicelister.mm
View File

@ -312,6 +312,23 @@ bool DeviceRequest(IOUSBDeviceInterface** dev,
return true;
}
int GetBusNumber(io_object_t o) {
io_iterator_t it;
kern_return_t err = IORegistryEntryGetParentIterator(o, kIOServicePlane, &it);
if (err != KERN_SUCCESS) {
return -1;
}
while ((o = IOIteratorNext(it))) {
NSObject* bus = GetPropertyForDevice(o, CFSTR("USBBusNumber"));
if (bus) {
NSNumber* bus_num = (NSNumber*)bus;
return [bus_num intValue];
}
}
return -1;
}
void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
MacDeviceLister* me = reinterpret_cast<MacDeviceLister*>(refcon);
@ -340,6 +357,14 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
<< device.product
<< device.product_id;
NSNumber* addr = (NSNumber*)GetPropertyForDevice(object, CFSTR("USB Address"));
int bus = GetBusNumber(object);
qDebug("Bus: %d Address: %d", bus, [addr intValue]);
if (!addr || bus == -1) {
// Failed to get bus or address number.
continue;
}
// First check the libmtp device list.
if (sMTPDeviceList.contains(device)) {
qDebug() << "Matched device to libmtp list!";