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

Remove requestSinks from SystemVolume plugin

Browse source 
Sinks are sent at connect time and updated as necessary, so drop
the request command.

See: https://invent.kde.org/network/kdeconnect-meta/-/merge_requests/8
This commit is contained in:
Andy Holmes 2024-11-14 14:13:21 -08:00
parent daf09c61d8
commit ad7d3dd964
No known key found for this signature in database
5 changed files with 47 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/remotesystemvolume/remotesystemvolumeplugin.cpp
View file

@ -56,13 +56,6 @@ void RemoteSystemVolumePlugin::sendMuted(const QString &name, bool muted)
sendPacket(np); sendPacket(np);
} }
void RemoteSystemVolumePlugin::connected()
{
NetworkPacket np(PACKET_TYPE_SYSTEMVOLUME_REQUEST);
np.set<bool>(QStringLiteral("requestSinks"), true);
sendPacket(np);
}
QByteArray RemoteSystemVolumePlugin::sinks() QByteArray RemoteSystemVolumePlugin::sinks()
{ {
return m_sinks; return m_sinks;

1
plugins/remotesystemvolume/remotesystemvolumeplugin.h
View file

@ -24,7 +24,6 @@ public:
using KdeConnectPlugin::KdeConnectPlugin; using KdeConnectPlugin::KdeConnectPlugin;
void receivePacket(const NetworkPacket &np) override; void receivePacket(const NetworkPacket &np) override;
void connected() override;
QString dbusPath() const override; QString dbusPath() const override;
QString deviceId() const QString deviceId() const

24
plugins/systemvolume/systemvolumeplugin-macos.cpp
View file

@ -221,21 +221,17 @@ SystemvolumePlugin::~SystemvolumePlugin()
void SystemvolumePlugin::receivePacket(const NetworkPacket &np) void SystemvolumePlugin::receivePacket(const NetworkPacket &np)
{ {
if (np.has(QStringLiteral("requestSinks"))) { QString name = np.get<QString>(QStringLiteral("name"));
sendSinkList();
} else {
QString name = np.get<QString>(QStringLiteral("name"));
if (m_sinksMap.contains(name)) { if (m_sinksMap.contains(name)) {
if (np.has(QStringLiteral("volume"))) { if (np.has(QStringLiteral("volume"))) {
m_sinksMap[name]->setVolume(np.get<int>(QStringLiteral("volume")) / 100.0); m_sinksMap[name]->setVolume(np.get<int>(QStringLiteral("volume")) / 100.0);
} }
if (np.has(QStringLiteral("muted"))) { if (np.has(QStringLiteral("muted"))) {
m_sinksMap[name]->setMuted(np.get<bool>(QStringLiteral("muted"))); m_sinksMap[name]->setMuted(np.get<bool>(QStringLiteral("muted")));
} }
if (np.has(QStringLiteral("enabled"))) { if (np.has(QStringLiteral("enabled"))) {
m_sinksMap[name]->setDefault(np.get<bool>(QStringLiteral("enabled"))); m_sinksMap[name]->setDefault(np.get<bool>(QStringLiteral("enabled")));
}
} }
} }
} }

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

@ -33,24 +33,20 @@ void SystemvolumePlugin::receivePacket(const NetworkPacket &np)
if (!PulseAudioQt::Context::instance()->isValid()) if (!PulseAudioQt::Context::instance()->isValid())
return; return;
if (np.has(QStringLiteral("requestSinks"))) { QString name = np.get<QString>(QStringLiteral("name"));
sendSinkList();
} else {
QString name = np.get<QString>(QStringLiteral("name"));
PulseAudioQt::Sink *sink = sinksMap.value(name); PulseAudioQt::Sink *sink = sinksMap.value(name);
if (sink) { if (sink) {
if (np.has(QStringLiteral("volume"))) { if (np.has(QStringLiteral("volume"))) {
int volume = np.get<int>(QStringLiteral("volume")); int volume = np.get<int>(QStringLiteral("volume"));
sink->setVolume(volume); sink->setVolume(volume);
sink->setMuted(false); sink->setMuted(false);
} }
if (np.has(QStringLiteral("muted"))) { if (np.has(QStringLiteral("muted"))) {
sink->setMuted(np.get<bool>(QStringLiteral("muted"))); sink->setMuted(np.get<bool>(QStringLiteral("muted")));
} }
if (np.has(QStringLiteral("enabled"))) { if (np.has(QStringLiteral("enabled"))) {
sink->setDefault(np.get<bool>(QStringLiteral("enabled"))); sink->setDefault(np.get<bool>(QStringLiteral("enabled")));
}
} }
} }
} }

52
plugins/systemvolume/systemvolumeplugin-win.cpp
View file

@ -404,38 +404,34 @@ void SystemvolumePlugin::receivePacket(const NetworkPacket &np)
if (!valid) if (!valid)
return; return;
if (np.has(QStringLiteral("requestSinks"))) { QString name = np.get<QString>(QStringLiteral("name"));
sendSinkList();
} else {
QString name = np.get<QString>(QStringLiteral("name"));
auto sinkListIterator = this->sinkList.find(name); auto sinkListIterator = this->sinkList.find(name);
if (sinkListIterator != this->sinkList.end()) { if (sinkListIterator != this->sinkList.end()) {
auto &sink = sinkListIterator.value(); auto &sink = sinkListIterator.value();
if (np.has(QStringLiteral("volume"))) { if (np.has(QStringLiteral("volume"))) {
float requestedVolume = (float)np.get<int>(QStringLiteral("volume"), 100) / 100; float requestedVolume = (float)np.get<int>(QStringLiteral("volume"), 100) / 100;
sinkList[name].first->SetMasterVolumeLevelScalar(requestedVolume, NULL); sinkList[name].first->SetMasterVolumeLevelScalar(requestedVolume, NULL);
} }
if (np.has(QStringLiteral("muted"))) { if (np.has(QStringLiteral("muted"))) {
BOOL requestedMuteStatus = np.get<bool>(QStringLiteral("muted"), false); BOOL requestedMuteStatus = np.get<bool>(QStringLiteral("muted"), false);
sinkList[name].first->SetMute(requestedMuteStatus, NULL); sinkList[name].first->SetMute(requestedMuteStatus, NULL);
} }
if (np.has(QStringLiteral("enabled"))) { if (np.has(QStringLiteral("enabled"))) {
// get the current default device ID // get the current default device ID
IMMDevice *defaultDevice = nullptr; IMMDevice *defaultDevice = nullptr;
deviceEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &defaultDevice); deviceEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &defaultDevice);
LPWSTR defaultId = NULL; LPWSTR defaultId = NULL;
defaultDevice->GetId(&defaultId); defaultDevice->GetId(&defaultId);
defaultDevice->Release(); defaultDevice->Release();
// get current sink's device ID // get current sink's device ID
QString qDefaultId = QString::fromWCharArray(defaultId); QString qDefaultId = QString::fromWCharArray(defaultId);
QString currentDeviceId = idToNameMap.key(name); QString currentDeviceId = idToNameMap.key(name);
if (qDefaultId != currentDeviceId) { if (qDefaultId != currentDeviceId) {
setDefaultAudioPlaybackDevice(name, np.get<bool>(QStringLiteral("enabled"))); setDefaultAudioPlaybackDevice(name, np.get<bool>(QStringLiteral("enabled")));
}
} }
} }
} }