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

refactor: Address (Windows) compile warnings (#840)

Browse Source 
* Windows compile errors and (Qt 5.15 deprecation) warnings

* Usability - Enable/Disable Instance button

Co-authored-by: brindosch <edeltraud70@gmx.de>
This commit is contained in:
LordGrey
2020-06-28 23:05:32 +02:00
committed by GitHub
parent e365a2839d
commit bfb50b8d91
61 changed files with 530 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/ssdp/SSDPDiscover.cpp
View File

@@ -1,6 +1,6 @@
#include <ssdp/SSDPDiscover.h>
// qt inc
// Qt includes
#include <QUdpSocket>
#include <QUrl>
@@ -40,7 +40,7 @@ const QString SSDPDiscover::getFirstService(const searchType& type, const QStrin
_searchTarget = st;
// search
sendSearch(st);
sendSearch(_searchTarget);
if ( _udpSocket->waitForReadyRead(timeout_ms) )
{
@@ -58,12 +58,18 @@ const QString SSDPDiscover::getFirstService(const searchType& type, const QStrin
QString data(datagram);
Debug(_log, "_data: [%s]", QSTRING_CSTR(data));
//Debug(_log, "_data: [%s]", QSTRING_CSTR(data));
QMap<QString,QString> headers;
QString address;
// parse request
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QStringList entries = data.split("\n", Qt::SkipEmptyParts);
#else
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#endif
for(auto entry : entries)
{
// http header parse skip
@@ -92,13 +98,13 @@ const QString SSDPDiscover::getFirstService(const searchType& type, const QStrin
_usnList << headers.value("usn");
QUrl url(headers.value("location"));
//Debug(_log, "Received msearch response from '%s:%d'. Search target: %s",QSTRING_CSTR(sender.toString()), senderPort, QSTRING_CSTR(headers.value("st")));
if(type == STY_WEBSERVER)
if(type == searchType::STY_WEBSERVER)
{
Debug(_log, "Found service [%s] at: %s:%d", QSTRING_CSTR(st), QSTRING_CSTR(url.host()), url.port());
return url.host()+":"+QString::number(url.port());
}
else if(type == STY_FLATBUFSERVER)
else if(type == searchType::STY_FLATBUFSERVER)
{
const QString fbsport = headers.value("hyperion-fbs-port");
if(fbsport.isEmpty())
@@ -111,7 +117,7 @@ const QString SSDPDiscover::getFirstService(const searchType& type, const QStrin
return url.host()+":"+fbsport;
}
}
else if(type == STY_JSONSERVER)
else if(type == searchType::STY_JSONSERVER)
{
const QString jssport = headers.value("hyperion-jss-port");
if(jssport.isEmpty())
@@ -146,7 +152,11 @@ void SSDPDiscover::readPendingDatagrams()
QString data(datagram);
QMap<QString,QString> headers;
// parse request
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QStringList entries = data.split("\n", Qt::SkipEmptyParts);
#else
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#endif
for(auto entry : entries)
{
// http header parse skip

6
libsrc/ssdp/SSDPServer.cpp
View File

@@ -137,7 +137,11 @@ void SSDPServer::readPendingDatagrams()
QString data(datagram);
QMap<QString,QString> headers;
// parse request
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QStringList entries = data.split("\n", Qt::SkipEmptyParts);
#else
QStringList entries = data.split("\n", QString::SkipEmptyParts);
#endif
for(auto entry : entries)
{
// http header parse skip