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

Don't probe USB hubs and HID devices on Mac as some of them don't like it.

Browse Source 
Update issue #981
Hopefully this fixes it.
This commit is contained in:
John Maguire 2011-11-21 15:16:24 +01:00
parent 4fd33ab200
commit b74c735268
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/devices/macdevicelister.mm
View File

@ -253,6 +253,20 @@ NSObject* GetPropertyForDevice(io_object_t device, CFStringRef key) {
return nil;
}
int GetUSBDeviceClass(io_object_t device) {
CFTypeRef interface_class = IORegistryEntrySearchCFProperty(
device,
kIOServicePlane,
CFSTR(kUSBInterfaceClass),
kCFAllocatorDefault,
kIORegistryIterateRecursively);
NSNumber* number = (NSNumber*)interface_class;
if (number) {
return [number unsignedShortValue];
}
return 0;
}
QString GetIconForDevice(io_object_t device) {
NSDictionary* media_icon = (NSDictionary*)GetPropertyForDevice(device, CFSTR("IOMediaIcon"));
if (media_icon) {
@ -460,6 +474,9 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
NSString* product = (NSString*)GetPropertyForDevice(object, CFSTR(kUSBProductString));
NSNumber* vendor_id = (NSNumber*)GetPropertyForDevice(object, CFSTR(kUSBVendorID));
NSNumber* product_id = (NSNumber*)GetPropertyForDevice(object, CFSTR(kUSBProductID));
int interface_class = GetUSBDeviceClass(object);
qLog(Debug) << "Interface class:" << interface_class;
QString serial = GetSerialForMTPDevice(object);
MTPDevice device;
@ -472,11 +489,14 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
device.bus = -1;
device.address = -1;
if (device.vendor_id == 0x5ac || // I think we can safely skip Apple products.
if (device.vendor_id == kAppleVendorID || // I think we can safely skip Apple products.
// Blacklist ilok2 as this probe may be breaking it.
(device.vendor_id == 0x088e && device.product_id == 0x5036) ||
// Blacklist eLicenser
(device.vendor_id == 0x0819 && device.product_id == 0x0101)) {
(device.vendor_id == 0x0819 && device.product_id == 0x0101) ||
// Skip HID devices and hubs.
interface_class == kUSBHIDInterfaceClass ||
interface_class == kUSBHubClass) {
continue;
}
@ -656,9 +676,8 @@ QString MacDeviceLister::MakeFriendlyName(const QString& serial) {
if (IsCDDevice(serial)) {
NSDictionary* properties = (NSDictionary*)DADiskCopyDescription(disk);
NSLog(@"%@", properties);
NSString* device_name = (NSString*)[properties objectForKey:(NSString*)kDADiskDescriptionMediaNameKey];
NSString* device_name = (NSString*)[properties objectForKey:
(NSString*)kDADiskDescriptionMediaNameKey];
CFRelease(disk);
CFRelease(session);