Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
/**
|
|
|
|
* Copyright 2017 Nicolas Fella <nicolas.fella@gmx.de>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of
|
|
|
|
* the License or (at your option) version 3 or any later version
|
|
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
|
|
* defined in Section 14 of version 3 of the license.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2019-03-23 16:29:26 +00:00
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
*/
|
|
|
|
|
2018-11-20 00:14:17 +00:00
|
|
|
#include "systemvolumeplugin-pulse.h"
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
|
|
|
|
#include <KPluginFactory>
|
|
|
|
|
|
|
|
#include <QDebug>
|
|
|
|
#include <QLoggingCategory>
|
|
|
|
#include <QProcess>
|
|
|
|
#include <QJsonArray>
|
|
|
|
#include <QJsonDocument>
|
|
|
|
#include <QJsonObject>
|
|
|
|
|
|
|
|
#include <core/device.h>
|
|
|
|
|
|
|
|
#include <PulseAudioQt/Sink>
|
|
|
|
#include <PulseAudioQt/Context>
|
|
|
|
|
2019-06-12 21:16:54 +01:00
|
|
|
K_PLUGIN_CLASS_WITH_JSON(SystemvolumePlugin, "kdeconnect_systemvolume.json")
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
|
|
|
|
Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SYSTEMVOLUME, "kdeconnect.plugin.systemvolume")
|
|
|
|
|
|
|
|
SystemvolumePlugin::SystemvolumePlugin(QObject* parent, const QVariantList& args)
|
|
|
|
: KdeConnectPlugin(parent, args)
|
|
|
|
, sinksMap()
|
|
|
|
{}
|
|
|
|
|
|
|
|
bool SystemvolumePlugin::receivePacket(const NetworkPacket& np)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!PulseAudioQt::Context::instance()->isValid())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (np.has(QStringLiteral("requestSinks"))) {
|
|
|
|
sendSinkList();
|
|
|
|
} else {
|
|
|
|
|
|
|
|
QString name = np.get<QString>(QStringLiteral("name"));
|
|
|
|
|
2020-04-29 04:45:25 +01:00
|
|
|
PulseAudioQt::Sink *sink = sinksMap.value(name);
|
|
|
|
if (sink) {
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
if (np.has(QStringLiteral("volume"))) {
|
2020-04-29 04:45:25 +01:00
|
|
|
int volume = np.get<int>(QStringLiteral("volume"));
|
|
|
|
sink->setVolume(volume);
|
|
|
|
sink->setMuted(false);
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
}
|
|
|
|
if (np.has(QStringLiteral("muted"))) {
|
2020-04-29 04:45:25 +01:00
|
|
|
sink->setMuted(np.get<bool>(QStringLiteral("muted")));
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SystemvolumePlugin::sendSinkList() {
|
|
|
|
|
|
|
|
QJsonDocument document;
|
|
|
|
QJsonArray array;
|
|
|
|
|
|
|
|
sinksMap.clear();
|
|
|
|
|
2018-11-25 22:58:24 +00:00
|
|
|
const auto sinks = PulseAudioQt::Context::instance()->sinks();
|
|
|
|
for (PulseAudioQt::Sink* sink : sinks) {
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
sinksMap.insert(sink->name(), sink);
|
|
|
|
|
|
|
|
connect(sink, &PulseAudioQt::Sink::volumeChanged, this, [this, sink] {
|
|
|
|
NetworkPacket np(PACKET_TYPE_SYSTEMVOLUME);
|
|
|
|
np.set<int>(QStringLiteral("volume"), sink->volume());
|
|
|
|
np.set<QString>(QStringLiteral("name"), sink->name());
|
|
|
|
sendPacket(np);
|
|
|
|
});
|
|
|
|
|
|
|
|
connect(sink, &PulseAudioQt::Sink::mutedChanged, this, [this, sink] {
|
|
|
|
NetworkPacket np(PACKET_TYPE_SYSTEMVOLUME);
|
|
|
|
np.set<bool>(QStringLiteral("muted"), sink->isMuted());
|
|
|
|
np.set<QString>(QStringLiteral("name"), sink->name());
|
|
|
|
sendPacket(np);
|
|
|
|
});
|
|
|
|
|
2019-04-22 19:02:59 +01:00
|
|
|
QJsonObject sinkObject {
|
2019-06-10 15:40:28 +01:00
|
|
|
{QStringLiteral("name"), sink->name()},
|
|
|
|
{QStringLiteral("muted"), sink->isMuted()},
|
|
|
|
{QStringLiteral("description"), sink->description()},
|
|
|
|
{QStringLiteral("volume"), sink->volume()},
|
|
|
|
{QStringLiteral("maxVolume"), PulseAudioQt::normalVolume()}
|
2019-04-22 19:02:59 +01:00
|
|
|
};
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
|
|
|
|
array.append(sinkObject);
|
|
|
|
}
|
|
|
|
|
|
|
|
document.setArray(array);
|
|
|
|
|
|
|
|
NetworkPacket np(PACKET_TYPE_SYSTEMVOLUME);
|
|
|
|
np.set<QJsonDocument>(QStringLiteral("sinkList"), document);
|
|
|
|
sendPacket(np);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SystemvolumePlugin::connected()
|
|
|
|
{
|
|
|
|
connect(PulseAudioQt::Context::instance(), &PulseAudioQt::Context::sinkAdded, this, [this] {
|
|
|
|
sendSinkList();
|
|
|
|
});
|
|
|
|
|
|
|
|
connect(PulseAudioQt::Context::instance(), &PulseAudioQt::Context::sinkRemoved, this, [this] {
|
|
|
|
sendSinkList();
|
|
|
|
});
|
|
|
|
|
2018-11-25 22:58:24 +00:00
|
|
|
const auto sinks = PulseAudioQt::Context::instance()->sinks();
|
|
|
|
for (PulseAudioQt::Sink* sink : sinks) {
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
sinksMap.insert(sink->name(), sink);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-20 00:14:17 +00:00
|
|
|
#include "systemvolumeplugin-pulse.moc"
|
Add systemvolume plugin
Summary: This plugin allows controlling the system value from a remote device.
Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider
Reviewers: #kde_connect, mtijink, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect
Tags: #kde_connect
Maniphest Tasks: T4659
Differential Revision: https://phabricator.kde.org/D7992
2018-07-27 07:39:46 +01:00
|
|
|
|