From 291c8d4f1a131aaa069a070cd5ef89dfd51ea953 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond@gmail.com" Date: Thu, 1 Nov 2012 12:15:38 +0000 Subject: [PATCH] Only want USB StorageAccess. --- devices/mediadevicecache.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/devices/mediadevicecache.cpp b/devices/mediadevicecache.cpp index 5b01f2d4e..600e620e2 100644 --- a/devices/mediadevicecache.cpp +++ b/devices/mediadevicecache.cpp @@ -105,13 +105,11 @@ void MediaDeviceCache::refreshCache() const Solid::StorageAccess* ssa = device.as(); if (ssa) { - // Commented out - as we want a signal when any storage device is added/removed - so we can check for MPD dir accessibility. - // device.cpp contains the check to ensure the device is a USB bevice before adding it to the list... -// if ((!device.parent().as() || Solid::StorageDrive::Usb!=device.parent().as()->bus()) && -// (!device.as() || Solid::StorageDrive::Usb!=device.as()->bus())) { -// debug() << "Found Solid::DeviceInterface::StorageAccess that is not usb, skipping"; -// continue; -// } + if ((!device.parent().as() || Solid::StorageDrive::Usb!=device.parent().as()->bus()) && + (!device.as() || Solid::StorageDrive::Usb!=device.as()->bus())) { + debug() << "Found Solid::DeviceInterface::StorageAccess that is not usb, skipping"; + continue; + } if (!m_volumes.contains(device.udi())) { connect(ssa, SIGNAL(accessibilityChanged(bool, const QString&)), this, SLOT(slotAccessibilityChanged(bool, const QString&))); @@ -311,5 +309,3 @@ const QString MediaDeviceCache::deviceName(const QString &udi) const } return "ERR_NO_NAME"; //Should never happen! } - -