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 detect CD devices on Mac when we can't use them and fix an iokit

Browse Source 
device leak.
This commit is contained in:
John Maguire 2011-08-15 18:13:05 +02:00
parent 56a4d6b743
commit 8ad150bd6b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/devices/macdevicelister.mm
View File

@ -15,6 +15,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "macdevicelister.h"
#include "mtpconnection.h"
#include "core/logging.h"
@ -338,6 +339,7 @@ void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) {
NSDictionary* properties = (NSDictionary*)DADiskCopyDescription(disk);
NSString* kind = [properties objectForKey:(NSString*)kDADiskDescriptionMediaKindKey];
#ifdef HAVE_AUDIOCD
if (kind && strcmp([kind UTF8String], kIOCDMediaClass) == 0) {
// CD inserted.
QString bsd_name = QString::fromAscii(DADiskGetBSDName(disk));
@ -345,6 +347,7 @@ void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) {
emit me->DeviceAdded(bsd_name);
return;
}
#endif
NSURL* volume_path =
[[properties objectForKey:(NSString*)kDADiskDescriptionVolumePathKey] copy];
@ -648,8 +651,6 @@ QString MacDeviceLister::MakeFriendlyName(const QString& serial) {
DADiskRef disk = DADiskCreateFromBSDName(
kCFAllocatorDefault, session, bsd_name.toAscii().constData());
io_object_t device = DADiskCopyIOMedia(disk);
if (IsCDDevice(serial)) {
NSDictionary* properties = (NSDictionary*)DADiskCopyDescription(disk);
NSLog(@"%@", properties);
@ -661,6 +662,8 @@ QString MacDeviceLister::MakeFriendlyName(const QString& serial) {
return QString::fromUtf8([device_name UTF8String]);
}
io_object_t device = DADiskCopyIOMedia(disk);
QString vendor = GetUSBRegistryEntryString(device, CFSTR(kUSBVendorString));
QString product = GetUSBRegistryEntryString(device, CFSTR(kUSBProductString));
IOObjectRelease(device);