frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'h801' of https://github.com/WoLpH/hyperion.ng into WoLpH-h801

Browse Source 
Conflicts:
	libsrc/leddevice/LedDeviceTpm2net.cpp
	libsrc/leddevice/LedDeviceUdpRaw.cpp
	libsrc/leddevice/ProviderUdp.cpp
	libsrc/leddevice/ProviderUdp.h
This commit is contained in:
redpanther
2016-09-22 13:57:52 +02:00
parent b8f1ad50b9 ad785b9eba
commit 4c78302473
9 changed files with 166 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/leddevice/ProviderUdp.cpp
View File

@@ -28,7 +28,11 @@ ProviderUdp::~ProviderUdp()
_udpSocket->close();
}
<<<<<<< HEAD
bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultLatchTime, int defaultPort, std::string defaultHost)
=======
bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultPort, std::string defaultHost)
>>>>>>> ad785b9eba371bca0829b8dc7df80c30afdc052a
{
QString host = QString::fromStdString(deviceConfig.get("host",defaultHost).asString());
@@ -48,7 +52,11 @@ bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultLatchTim
Debug( _log, "Successfully parsed %s as a hostname.", deviceConfig["host"].asString().c_str());
_address = info.addresses().first();
}
<<<<<<< HEAD
=======
>>>>>>> ad785b9eba371bca0829b8dc7df80c30afdc052a
_port = deviceConfig.get("port", defaultPort).asUInt();
if ( _port<=0 || _port > 65535)
{