Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Fallback to device-ipod for ipod icon name

This commit is contained in:
Jonas Kvinge 2020-09-02 19:36:47 +02:00
parent ebab9b7e4a
commit e373a17cd3
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/device/devicelister.cpp
View File

@ -237,20 +237,31 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) {
itdb_device_set_mountpoint(device, path.toLocal8Bit().constData()); itdb_device_set_mountpoint(device, path.toLocal8Bit().constData());
const Itdb_IpodInfo* info = itdb_device_get_ipod_info(device); const Itdb_IpodInfo* info = itdb_device_get_ipod_info(device);
QString colour = GetIpodColour(info->ipod_model); if (info->ipod_model == ITDB_IPOD_MODEL_INVALID) {
QString model = GetIpodModel(info->ipod_model); ret << "device-ipod";
}
else {
QString colour = GetIpodColour(info->ipod_model);
QString model = GetIpodModel(info->ipod_model);
itdb_device_free(device); itdb_device_free(device);
if (!colour.isEmpty()) {
QString colour_icon = "multimedia-player-ipod-%1-%2";
ret << colour_icon.arg(model, colour);
}
if (!model.isEmpty()) {
QString model_icon = "multimedia-player-ipod-%1";
ret << model_icon.arg(model);
}
if (ret.isEmpty()) {
ret << "device-ipod";
}
if (!colour.isEmpty()) {
QString colour_icon = "multimedia-player-ipod-%1-%2";
ret << colour_icon.arg(model, colour);
} }
if (!model.isEmpty()) {
QString model_icon = "multimedia-player-ipod-%1";
ret << model_icon.arg(model);
}
} }
#else #else
Q_UNUSED(path) Q_UNUSED(path)