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

plugins/systemvolume: Remove workaround for mingw toolchain

Browse source 
This reverts the change from 595e8d9a35
and a01af1b406 commit.

PKEY_Device_DeviceDesc was added in mingw-w64 headers in the
following commit.

0b02ea1d7d/
0b02ea1d7d (mirror)
This commit is contained in:
Biswapriyo Nath 2024-10-14 06:02:18 +00:00 committed by Albert Vaca Cintora
parent 902179f3f9
commit 935d874d57
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,12 +203,9 @@ public:
// This callback is supper spammy. Care only about name and description changes. // This callback is supper spammy. Care only about name and description changes.
if (IsEqualPropertyKey(key, PKEY_Device_FriendlyName)) { if (IsEqualPropertyKey(key, PKEY_Device_FriendlyName)) {
enclosing.sendSinkList(); enclosing.sendSinkList();
} } else if (IsEqualPropertyKey(key, PKEY_Device_DeviceDesc)) {
#ifndef __MINGW32__
else if (IsEqualPropertyKey(key, PKEY_Device_DeviceDesc)) {
enclosing.sendSinkList(); enclosing.sendSinkList();
} }
#endif
return S_OK; return S_OK;
} }
@ -302,13 +299,9 @@ bool SystemvolumePlugin::sendSinkList()
name = QString::fromWCharArray(deviceProperty.pwszVal); name = QString::fromWCharArray(deviceProperty.pwszVal);
PropVariantClear(&deviceProperty); PropVariantClear(&deviceProperty);
#ifndef __MINGW32__
deviceProperties->GetValue(PKEY_Device_DeviceDesc, &deviceProperty); deviceProperties->GetValue(PKEY_Device_DeviceDesc, &deviceProperty);
desc = QString::fromWCharArray(deviceProperty.pwszVal); desc = QString::fromWCharArray(deviceProperty.pwszVal);
PropVariantClear(&deviceProperty); PropVariantClear(&deviceProperty);
#else
desc = name;
#endif
QJsonObject sinkObject; QJsonObject sinkObject;
sinkObject.insert(QStringLiteral("name"), name); sinkObject.insert(QStringLiteral("name"), name);

4
plugins/systemvolume/systemvolumeplugin-win.h
View file

@ -15,10 +15,6 @@
#include <endpointvolume.h> #include <endpointvolume.h>
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
#ifdef __MINGW32__
#include <initguid.h>
#endif
#define PACKET_TYPE_SYSTEMVOLUME QStringLiteral("kdeconnect.systemvolume") #define PACKET_TYPE_SYSTEMVOLUME QStringLiteral("kdeconnect.systemvolume")
#define PACKET_TYPE_SYSTEMVOLUME_REQUEST QStringLiteral("kdeconnect.systemvolume.request") #define PACKET_TYPE_SYSTEMVOLUME_REQUEST QStringLiteral("kdeconnect.systemvolume.request")