frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

fix last merge

Browse Source
This commit is contained in:
redPanther 2016-09-22 14:26:24 +02:00 committed by GitHub
parent d658c4f8e1
commit e58d7b27eb
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/leddevice/ProviderUdp.cpp
View File

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