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

Detect MTP device removal & free space/capacity on Mac.

This commit is contained in:
John Maguire 2010-09-04 19:32:36 +00:00
parent c440657904
commit 885a711d3a
4 changed files with 106 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/macdevicelister.h
View File

@ -3,6 +3,7 @@
#include "devicelister.h"
#include <QMutex>
#include <QThread>
#include <DiskArbitration/DADisk.h>
@ -29,6 +30,7 @@ class MacDeviceLister : public DeviceLister {
virtual void UpdateDeviceFreeSpace(const QString& id);
struct MTPDevice {
MTPDevice() : capacity(0), free_space(0) {}
QString vendor;
QString product;
quint16 vendor_id;
@ -37,6 +39,9 @@ class MacDeviceLister : public DeviceLister {
int quirks;
int bus;
int address;
int capacity;
int free_space;
};
public slots:
@ -48,11 +53,16 @@ class MacDeviceLister : public DeviceLister {
static void DiskAddedCallback(DADiskRef disk, void* context);
static void DiskRemovedCallback(DADiskRef disk, void* context);
static void USBDeviceAddedCallback(void* refcon, io_iterator_t it);
static void USBDeviceRemovedCallback(void* refcon, io_iterator_t it);
static void DiskUnmountCallback(
DADiskRef disk, DADissenterRef dissenter, void* context);
void FoundMTPDevice(const MTPDevice& device, const QString& serial);
void RemovedMTPDevice(const QString& serial);
int GetFreeSpace(const QUrl& url);
int GetCapacity(const QUrl& url);
DASessionRef loop_session_;
CFRunLoopRef run_loop_;
@ -60,6 +70,8 @@ class MacDeviceLister : public DeviceLister {
QMap<QString, QString> current_devices_;
QMap<QString, MTPDevice> mtp_devices_;
QMutex libmtp_mutex_;
static QSet<MTPDevice> sMTPDeviceList;
};

101
src/devices/macdevicelister.mm
View File

@ -1,5 +1,7 @@
#include "macdevicelister.h"
#include "mtpconnection.h"
#include <CoreFoundation/CFRunLoop.h>
#include <DiskArbitration/DiskArbitration.h>
#include <IOKit/kext/KextManager.h>
@ -20,6 +22,7 @@
#include <QtDebug>
#include <QMutex>
#include <QString>
#include <QStringList>
@ -99,6 +102,8 @@ void MacDeviceLister::Init() {
// Register for USB device connection/disconnection.
IONotificationPortRef notification_port = IONotificationPortCreate(kIOMasterPortDefault);
CFMutableDictionaryRef matching_dict = IOServiceMatching(kIOUSBDeviceClassName);
// IOServiceAddMatchingNotification decreases reference count.
CFRetain(matching_dict);
io_iterator_t it;
kern_return_t err = IOServiceAddMatchingNotification(
notification_port,
@ -113,6 +118,19 @@ void MacDeviceLister::Init() {
qWarning() << "Could not add notification on USB device connection";
}
err = IOServiceAddMatchingNotification(
notification_port,
kIOTerminatedNotification,
matching_dict,
&USBDeviceRemovedCallback,
reinterpret_cast<void*>(this),
&it);
if (err == KERN_SUCCESS) {
USBDeviceRemovedCallback(this, it);
} else {
qWarning() << "Could not add notification USB device removal";
}
CFRunLoopSourceRef io_source = IONotificationPortGetRunLoopSource(notification_port);
CFRunLoopAddSource(run_loop_, io_source, kCFRunLoopDefaultMode);
@ -250,6 +268,26 @@ QString FindDeviceProperty(const QString& bsd_name, CFStringRef property) {
}
int MacDeviceLister::GetFreeSpace(const QUrl& url) {
QMutexLocker l(&libmtp_mutex_);
MtpConnection connection(url);
if (!connection.is_valid()) {
qWarning() << "Error connecting to MTP device, couldn't get device free space";
return -1;
}
return connection.device()->storage->FreeSpaceInBytes;
}
int MacDeviceLister::GetCapacity(const QUrl& url) {
QMutexLocker l(&libmtp_mutex_);
MtpConnection connection(url);
if (!connection.is_valid()) {
qWarning() << "Error connecting to MTP device, couldn't get device capacity";
return -1;
}
return connection.device()->storage->MaxCapacity;
}
void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) {
MacDeviceLister* me = reinterpret_cast<MacDeviceLister*>(context);
@ -373,15 +411,8 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
continue;
}
qDebug() << device.vendor
<< device.vendor_id
<< device.product
<< device.product_id
<< serial;
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;
@ -392,7 +423,6 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
// First check the libmtp device list.
QSet<MTPDevice>::const_iterator it = sMTPDeviceList.find(device);
if (it != sMTPDeviceList.end()) {
qDebug() << "Matched device to libmtp list!";
// Fill in quirks flags from libmtp.
device.quirks = it->quirks;
me->FoundMTPDevice(device, GetSerialForMTPDevice(object));
@ -485,9 +515,49 @@ void MacDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
}
}
void MacDeviceLister::USBDeviceRemovedCallback(void* refcon, io_iterator_t it) {
MacDeviceLister* me = reinterpret_cast<MacDeviceLister*>(refcon);
io_object_t object;
while ((object = IOIteratorNext(it))) {
CFStringRef class_name = IOObjectCopyClass(object);
BOOST_SCOPE_EXIT((class_name)(object)) {
CFRelease(class_name);
IOObjectRelease(object);
} BOOST_SCOPE_EXIT_END
if (CFStringCompare(class_name, CFSTR(kIOUSBDeviceClassName), 0) == kCFCompareEqualTo) {
NSString* vendor = (NSString*)GetPropertyForDevice(object, CFSTR(kUSBVendorString));
NSString* product = (NSString*)GetPropertyForDevice(object, CFSTR(kUSBProductString));
NSNumber* vendor_id = (NSNumber*)GetPropertyForDevice(object, CFSTR(kUSBVendorID));
NSNumber* product_id = (NSNumber*)GetPropertyForDevice(object, CFSTR(kUSBProductID));
QString serial = GetSerialForMTPDevice(object);
MTPDevice device;
device.vendor = QString::fromUtf8([vendor UTF8String]);
device.product = QString::fromUtf8([product UTF8String]);
device.vendor_id = [vendor_id unsignedShortValue];
device.product_id = [product_id unsignedShortValue];
me->RemovedMTPDevice(serial);
}
}
}
void MacDeviceLister::RemovedMTPDevice(const QString& serial) {
int count = mtp_devices_.remove(serial);
if (count) {
qDebug() << "MTP device removed:" << serial;
emit DeviceRemoved(serial);
}
}
void MacDeviceLister::FoundMTPDevice(const MTPDevice& device, const QString& serial) {
qDebug() << "New MTP device detected!";
qDebug() << "New MTP device detected!" << device.bus << device.address;
mtp_devices_[serial] = device;
QList<QUrl> urls = MakeDeviceUrls(serial);
MTPDevice* d = &mtp_devices_[serial];
d->capacity = GetCapacity(urls[0]);
d->free_space = GetFreeSpace(urls[0]);
emit DeviceAdded(serial);
}
@ -606,7 +676,8 @@ QString MacDeviceLister::DeviceModel(const QString& serial){
quint64 MacDeviceLister::DeviceCapacity(const QString& serial){
if (IsMTPSerial(serial)) {
return 10000000;
QList<QUrl> urls = MakeDeviceUrls(serial);
return mtp_devices_[serial].capacity;
}
QString bsd_name = current_devices_[serial];
DASessionRef session = DASessionCreate(kCFAllocatorDefault);
@ -629,7 +700,8 @@ quint64 MacDeviceLister::DeviceCapacity(const QString& serial){
quint64 MacDeviceLister::DeviceFreeSpace(const QString& serial){
if (IsMTPSerial(serial)) {
return 10000000;
QList<QUrl> urls = MakeDeviceUrls(serial);
return mtp_devices_[serial].free_space;
}
QString bsd_name = current_devices_[serial];
DASessionRef session = DASessionCreate(kCFAllocatorDefault);
@ -683,5 +755,12 @@ void MacDeviceLister::DiskUnmountCallback(
}
void MacDeviceLister::UpdateDeviceFreeSpace(const QString& serial) {
if (IsMTPSerial(serial)) {
if (mtp_devices_.contains(serial)) {
QList<QUrl> urls = MakeDeviceUrls(serial);
MTPDevice* d = &mtp_devices_[serial];
d->free_space = GetFreeSpace(urls[0]);
}
}
emit DeviceChanged(serial);
}

2
src/devices/mtpconnection.cpp
View File

@ -45,8 +45,6 @@ MtpConnection::MtpConnection(const QUrl& url)
raw_device->bus_location = bus_location;
raw_device->devnum = device_num;
qDebug() << "\\o/" << url;
device_ = LIBMTP_Open_Raw_Device(raw_device);
return;
}

4
src/devices/mtpdevice.h
View File

@ -41,6 +41,8 @@ public:
void Init();
bool GetSupportedFiletypes(QList<Song::FileType>* ret);
int GetFreeSpace();
int GetCapacity();
bool StartCopy(QList<Song::FileType>* supported_types);
bool CopyToStorage(const CopyJob& job);
@ -55,6 +57,8 @@ private slots:
private:
bool GetSupportedFiletypes(QList<Song::FileType>* ret, LIBMTP_mtpdevice_t* device);
int GetFreeSpace(LIBMTP_mtpdevice_t* device);
int GetCapacity(LIBMTP_mtpdevice_t* device);
private:
static bool sInitialisedLibMTP;