Only want USB StorageAccess.

This commit is contained in:
craig.p.drummond@gmail.com
2012-11-01 12:15:38 +00:00
committed by craig.p.drummond@gmail.com
parent 28f0296685
commit 291c8d4f1a

View File

@@ -105,13 +105,11 @@ void MediaDeviceCache::refreshCache()
const Solid::StorageAccess* ssa = device.as<Solid::StorageAccess>();
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>() || Solid::StorageDrive::Usb!=device.parent().as<Solid::StorageDrive>()->bus()) &&
// (!device.as<Solid::StorageDrive>() || Solid::StorageDrive::Usb!=device.as<Solid::StorageDrive>()->bus())) {
// debug() << "Found Solid::DeviceInterface::StorageAccess that is not usb, skipping";
// continue;
// }
if ((!device.parent().as<Solid::StorageDrive>() || Solid::StorageDrive::Usb!=device.parent().as<Solid::StorageDrive>()->bus()) &&
(!device.as<Solid::StorageDrive>() || Solid::StorageDrive::Usb!=device.as<Solid::StorageDrive>()->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!
}