ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched from zeroconf to upnp discovery

Browse Source
This commit is contained in:
nymea 2019-06-12 21:00:57 +02:00
parent 944a126204
commit 89462334a2
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
denon/deviceplugindenon.cpp
View File

@ -43,13 +43,17 @@
#include "deviceplugindenon.h" #include "deviceplugindenon.h"
#include "plugininfo.h" #include "plugininfo.h"
#include "plugin/device.h"
#include "network/networkaccessmanager.h"
#include "network/upnp/upnpdiscovery.h" #include "network/upnp/upnpdiscovery.h"
#include "network/upnp/upnpdiscoveryreply.h" #include "network/upnp/upnpdiscoveryreply.h"
#include "network/avahi/qtavahiservicebrowser.h" #include "platform/platformzeroconfcontroller.h"
#include "network/zeroconf/zeroconfservicebrowser.h"
#include <QDebug> #include <QDebug>
#include <QStringList> #include <QStringList>
#include <QJsonDocument> #include <QJsonDocument>
#include <QTimer>
DevicePluginDenon::DevicePluginDenon() DevicePluginDenon::DevicePluginDenon()
{ {
@ -61,24 +65,8 @@ DeviceManager::DeviceError DevicePluginDenon::discoverDevices(const DeviceClassI
if (deviceClassId == AVRX1000DeviceClassId) { if (deviceClassId == AVRX1000DeviceClassId) {
QList<DeviceDescriptor> deviceDescriptors; UpnpDiscoveryReply *reply = hardwareManager()->upnpDiscovery()->discoverDevices("urn:schemas-upnp-org:device:MediaRenderer:1", "nymea", 7000);
foreach (const AvahiServiceEntry &service, hardwareManager()->avahiBrowser()->serviceEntries()) { connect(reply, &UpnpDiscoveryReply::finished, this, &DevicePluginDenon::onUpnpDiscoveryFinished);
if (service.name().contains("AVR-X1000")) {
DeviceDescriptor deviceDescriptor(AVRX1000DeviceClassId, service.hostName().remove(".local"), service.hostAddress().toString());
ParamList params;
qCDebug(dcDenon) << "Avahi discovered device: " << service.name() << service.hostName() << service.serviceType();
params.append(Param(AVRX1000DeviceIpParamTypeId, service.hostAddress().toString()));
deviceDescriptor.setParams(params);
foreach (Device *existingDevice, myDevices()) {
if (existingDevice->paramValue(AVRX1000DeviceIpParamTypeId).toString() == service.hostAddress().toString()) {
deviceDescriptor.setDeviceId(existingDevice->id());
break;
}
}
deviceDescriptors.append(deviceDescriptor);
}
}
emit devicesDiscovered(AVRX1000DeviceClassId, deviceDescriptors);
return DeviceManager::DeviceErrorAsync; return DeviceManager::DeviceErrorAsync;
} }
@ -497,7 +485,8 @@ void DevicePluginDenon::onUpnpDiscoveryFinished()
return; return;
} }
QList<DeviceDescriptor> deviceDescriptors; QList<DeviceDescriptor> heosDescriptors;
QList<DeviceDescriptor> avrDescriptors;
foreach (const UpnpDeviceDescriptor &upnpDevice, reply->deviceDescriptors()) { foreach (const UpnpDeviceDescriptor &upnpDevice, reply->deviceDescriptors()) {
if (upnpDevice.modelName().contains("HEOS")) { if (upnpDevice.modelName().contains("HEOS")) {
@ -517,11 +506,19 @@ void DevicePluginDenon::onUpnpDiscoveryFinished()
params.append(Param(heosDeviceIpParamTypeId, upnpDevice.hostAddress().toString())); params.append(Param(heosDeviceIpParamTypeId, upnpDevice.hostAddress().toString()));
params.append(Param(heosDeviceSerialNumberParamTypeId, serialNumber)); params.append(Param(heosDeviceSerialNumberParamTypeId, serialNumber));
descriptor.setParams(params); descriptor.setParams(params);
deviceDescriptors.append(descriptor); heosDescriptors.append(descriptor);
} }
} }
//if (upnpDevice.modelName().contains("")) {
qCDebug(dcDenon) << "UPnP device found:" << upnpDevice.modelDescription() << upnpDevice.friendlyName() << upnpDevice.hostAddress().toString() << upnpDevice.modelName() << upnpDevice.manufacturer() << upnpDevice.serialNumber();
//}
}
if (!heosDescriptors.isEmpty()) {
emit devicesDiscovered(heosDeviceClassId, heosDescriptors);
}
if (!avrDescriptors.isEmpty()) {
emit devicesDiscovered(AVRX1000DeviceClassId, avrDescriptors);
} }
emit devicesDiscovered(heosDeviceClassId, deviceDescriptors);
} }
void DevicePluginDenon::onHeosConnectionChanged() void DevicePluginDenon::onHeosConnectionChanged()

1
denon/deviceplugindenon.h
View File

@ -67,6 +67,7 @@ private:
private slots: private slots:
void onPluginTimer(); void onPluginTimer();
void onAVRConnectionChanged(); void onAVRConnectionChanged();
void onAVRDataReceived(const QByteArray &data); void onAVRDataReceived(const QByteArray &data);
void onAVRSocketError(); void onAVRSocketError();