Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

udisks2lister: enable ipod recognition

Browse Source 
The extends two functions:
- Recognize iPods as iPods, check for them in MakeDeviceUrls
- Give them a nice Icon in DeviceIcons (code taken from devicekitlister)
This commit is contained in:
Gerion Entrup 2020-08-28 00:18:59 +02:00 committed by John Maguire
parent 2d280734aa
commit 6821f6d7bd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/devices/udisks2lister.cpp
View File

@ -39,7 +39,12 @@ QStringList Udisks2Lister::DeviceUniqueIDs() {
} }
QVariantList Udisks2Lister::DeviceIcons(const QString& id) { QVariantList Udisks2Lister::DeviceIcons(const QString& id) {
return QVariantList(); QReadLocker locker(&device_data_lock_);
if (!device_data_.contains(id)) return QVariantList();
QString path = device_data_[id].mount_paths.at(0);
return QVariantList() << GuessIconForPath(path)
<< GuessIconForModel(DeviceManufacturer(id),
DeviceModel(id));
} }
QString Udisks2Lister::DeviceManufacturer(const QString& id) { QString Udisks2Lister::DeviceManufacturer(const QString& id) {
@ -91,7 +96,7 @@ QString Udisks2Lister::MakeFriendlyName(const QString& id) {
QList<QUrl> Udisks2Lister::MakeDeviceUrls(const QString& id) { QList<QUrl> Udisks2Lister::MakeDeviceUrls(const QString& id) {
QReadLocker locker(&device_data_lock_); QReadLocker locker(&device_data_lock_);
if (!device_data_.contains(id)) return QList<QUrl>(); if (!device_data_.contains(id)) return QList<QUrl>();
return QList<QUrl>() << QUrl::fromLocalFile( return QList<QUrl>() << MakeUrlFromLocalPath(
device_data_[id].mount_paths.at(0)); device_data_[id].mount_paths.at(0));
} }