tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Nicolas Fella 2020-05-14 18:16:05 +02:00
commit 872d5c6464
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/findthisdevice/findthisdeviceplugin.cpp
View file

@ -47,7 +47,7 @@ bool FindThisDevicePlugin::receivePacket(const NetworkPacket& np)
{
Q_UNUSED(np);
const QString soundFile = config()->get<QString>(QStringLiteral("ringtone"), defaultSound());
const QUrl soundURL = QUrl(soundFile);
const QUrl soundURL = QUrl::fromLocalFile(soundFile);
if (soundURL.isEmpty()) {
qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Not playing sound, no valid ring tone specified.";
return true;

4
plugins/findthisdevice/findthisdeviceplugin.h
View file

@ -81,7 +81,7 @@ inline QString defaultSound()
soundURL = QUrl::fromUserInput(QStringLiteral("Oxygen-Im-Phone-Ring.ogg"),
dirPath,
QUrl::AssumeLocalFile);
if ((soundURL.isLocalFile() && QFile::exists(soundURL.toLocalFile())) || soundURL.isValid()) {
if ((soundURL.isLocalFile() && soundURL.isValid() && QFile::exists(soundURL.toLocalFile()))) {
break;
}
}
@ -89,7 +89,7 @@ inline QString defaultSound()
if (soundURL.isEmpty()) {
qCWarning(KDECONNECT_PLUGIN_FINDTHISDEVICE) << "Could not find default ring tone.";
}
return soundURL.toString();
return soundURL.toLocalFile();
}
#endif //FINDTHISDEVICEPLUGIN_H

9
plugins/systemvolume/systemvolumeplugin-pulse.cpp
View file

@ -55,12 +55,15 @@ bool SystemvolumePlugin::receivePacket(const NetworkPacket& np)
QString name = np.get<QString>(QStringLiteral("name"));
if (sinksMap.contains(name)) {
PulseAudioQt::Sink *sink = sinksMap.value(name);
if (sink) {
if (np.has(QStringLiteral("volume"))) {
sinksMap[name]->setVolume(np.get<int>(QStringLiteral("volume")));
int volume = np.get<int>(QStringLiteral("volume"));
sink->setVolume(volume);
sink->setMuted(false);
}
if (np.has(QStringLiteral("muted"))) {
sinksMap[name]->setMuted(np.get<bool>(QStringLiteral("muted")));
sink->setMuted(np.get<bool>(QStringLiteral("muted")));
}
}
}