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 compile on Leopard & support correct icons on Mac.

This commit is contained in:
John Maguire 2010-07-26 11:01:36 +00:00
parent 6358198b06
commit 41d1facd9f
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/macdevicelister.mm
View File

@ -18,6 +18,18 @@
#include <QString>
#include <QStringList>
#ifndef kUSBSerialNumberString
#define kUSBSerialNumberString "USB Serial Number"
#endif
#ifndef kUSBVendorString
#define kUSBVendorString "USB Vendor Name"
#endif
#ifndef kUSBProductString
#define kUSBProductString "USB Product Name"
#endif
MacDeviceLister::MacDeviceLister() {
}
@ -257,11 +269,19 @@ QStringList MacDeviceLister::DeviceIcons(const QString& serial) {
io_object_t device = DADiskCopyIOMedia(disk);
QString icon = GetIconForDevice(device);
NSDictionary* properties = (NSDictionary*)DADiskCopyDescription(disk);
NSURL* volume_path =
[[properties objectForKey:(NSString*)kDADiskDescriptionVolumePathKey] copy];
QString path = QString::fromUtf8([[volume_path path] UTF8String]);
IOObjectRelease(device);
CFRelease(disk);
CFRelease(session);
QStringList ret;
ret << GuessIconForPath(path);
ret << GuessIconForModel(DeviceManufacturer(serial), DeviceModel(serial));
if (!icon.isEmpty()) {
ret << icon;
}