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

Feat: SSDP discovery for hyperion-remote (#602)

Browse Source 
* Auto stash before merge of "log" and "hyperion-project/master"

* resolve merge tool mess
This commit is contained in:
brindosch
2019-08-17 09:44:57 +02:00
committed by GitHub
parent c4d0edd9c2
commit d3f45e7ae5
17 changed files with 104 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ssdp/SSDPDiscover.h
View File

@@ -7,7 +7,8 @@ class QUdpSocket;
enum searchType{
STY_WEBSERVER,
STY_FLATBUFSERVER
STY_FLATBUFSERVER,
STY_JSONSERVER
};
///

3
include/ssdp/SSDPHandler.h
View File

@@ -19,7 +19,7 @@ class QNetworkConfigurationManager;
class SSDPHandler : public SSDPServer{
Q_OBJECT
public:
SSDPHandler(WebServer* webserver, const quint16& flatBufPort, QObject * parent = nullptr);
SSDPHandler(WebServer* webserver, const quint16& flatBufPort, const quint16& jsonServerPort, QObject * parent = nullptr);
~SSDPHandler();
public slots:
@@ -89,7 +89,6 @@ private:
WebServer* _webserver;
QString _localAddress;
QNetworkConfigurationManager* _NCA;
quint16 _flatbufPort;
QString _uuid;
/// Targets for announcement
std::vector<QString> _deviceList;

16
include/ssdp/SSDPServer.h
View File

@@ -78,6 +78,21 @@ public:
///
void setFlatBufPort(const quint16& port) { _fbsPort = QString::number(port); };
///
/// @brief Get current flatbuffer server port
///
quint16 getFlatBufPort() { return _fbsPort.toInt(); };
///
/// @brief set new jsonserver server port
///
void setJsonServerPort(const quint16& port) { _jssPort = QString::number(port); };
///
/// @brief get new jsonserver server port
///
quint16 getJsonServerPort() { return _jssPort.toInt(); };
signals:
///
/// @brief Emits whenever a new SSDP search "man : ssdp:discover" is received along with the service type
@@ -95,6 +110,7 @@ private:
QString _serverHeader;
QString _uuid;
QString _fbsPort;
QString _jssPort;
QString _descAddress;
bool _running;