Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix USB mass storage devices on Mac. 

Fixes issue #821
This commit is contained in:
John Maguire 2010-09-27 17:27:08 +00:00
parent c7bd0d3b01
commit e993909bd0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/devices/macdevicelister.mm
View File

@ -7,6 +7,7 @@
#include <IOKit/kext/KextManager.h>
#include <IOKit/IOCFPlugin.h>
#include <IOKit/usb/IOUSBLib.h>
#include <IOKit/storage/IOMedia.h>
#import <AppKit/NSWorkspace.h>
#import <Foundation/NSAutoreleasePool.h>
@ -252,8 +253,11 @@ QString GetIconForDevice(io_object_t device) {
}
QString GetSerialForDevice(io_object_t device) {
return QString(
"USB/" + GetUSBRegistryEntryString(device, CFSTR(kUSBSerialNumberString)));
QString serial = GetUSBRegistryEntryString(device, CFSTR(kUSBSerialNumberString));
if (!serial.isEmpty()) {
return "USB/" + serial;
}
return QString();
}
QString GetSerialForMTPDevice(io_object_t device) {
@ -308,7 +312,7 @@ void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) {
if (volume_path) {
io_object_t device = DADiskCopyIOMedia(disk);
CFStringRef class_name = IOObjectCopyClass(device);
if (class_name && CFStringCompare(class_name, CFSTR(kIOUSBDeviceClassName), 0) == kCFCompareEqualTo) {
if (class_name && CFStringCompare(class_name, CFSTR(kIOMediaClass), 0) == kCFCompareEqualTo) {
QString vendor = GetUSBRegistryEntryString(device, CFSTR(kUSBVendorString));
QString product = GetUSBRegistryEntryString(device, CFSTR(kUSBProductString));
@ -320,8 +324,10 @@ void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) {
NSDictionary* dict = (NSDictionary*)properties;
if ([[dict objectForKey:@"Removable"] intValue] == 1) {
QString serial = GetSerialForDevice(device);
me->current_devices_[serial] = QString(DADiskGetBSDName(disk));
emit me->DeviceAdded(serial);
if (!serial.isEmpty()) {
me->current_devices_[serial] = QString(DADiskGetBSDName(disk));
emit me->DeviceAdded(serial);
}
}
}
}

2
src/lyrics/ultimatelyricsreader.h
View File

@ -18,11 +18,11 @@
#define ULTIMATELYRICSREADER_H
#include <QObject>
#include <QXmlStreamReader>
#include "htmlscraper.h"
class QIODevice;
class QXmlStreamReader;
class UltimateLyricsReader : public QObject {
Q_OBJECT