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

UDP listener removed because this class is not multi-instance capable. For a new implementation, image data is needed instead of led colors.

Browse Source 
Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther
2019-07-23 22:00:43 +02:00
parent a3b326a18d
commit a4811b7e3c
29 changed files with 782 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/hyperiond/hyperiond.cpp
View File

@@ -18,8 +18,10 @@
#include <utils/Components.h>
#include <utils/JsonUtils.h>
// bonjour browser
#include <bonjour/bonjourbrowserwrapper.h>
#include <jsonserver/JsonServer.h>
#include <udplistener/UDPListener.h>
#include <webserver/WebServer.h>
#include <HyperionConfig.h> // Required to determine the cmake options
#include "hyperiond.h"
@@ -30,9 +32,6 @@
// Protobuffer Server
#include <protoserver/ProtoServer.h>
// bonjour browser
#include <bonjour/bonjourbrowserwrapper.h>
// ssdp
#include <ssdp/SSDPHandler.h>
@@ -66,7 +65,6 @@ HyperionDaemon::HyperionDaemon(const QString rootPath, QObject *parent, const bo
, _pyInit(new PythonInit())
, _webserver(nullptr)
, _jsonServer(nullptr)
, _udpListener(nullptr)
, _v4l2Grabber(nullptr)
, _dispmanx(nullptr)
, _x11Grabber(nullptr)
@@ -172,7 +170,6 @@ void HyperionDaemon::freeObjects()
_ssdp->thread()->wait(1000);
_webserver->thread()->quit();
_webserver->thread()->wait(1000);
delete _udpListener;
// stop Hyperions (non blocking)
_instanceManager->stopAll();
@@ -197,7 +194,6 @@ void HyperionDaemon::freeObjects()
_ssdp = nullptr;
_webserver = nullptr;
_jsonServer = nullptr;
_udpListener = nullptr;
}
void HyperionDaemon::startNetworkServices()
@@ -226,11 +222,6 @@ void HyperionDaemon::startNetworkServices()
connect( this, &HyperionDaemon::settingsChanged, _protoServer, &ProtoServer::handleSettingsUpdate );
pThread->start();
// Create UDP listener
_udpListener = new UDPListener(getSetting(settings::UDPLISTENER));
connect(this, &HyperionDaemon::settingsChanged, _udpListener, &UDPListener::handleSettingsUpdate);
connect(this, &HyperionDaemon::componentStateChanged, _udpListener, &UDPListener::updatedComponentState);
// Create Webserver in thread
_webserver = new WebServer(getSetting(settings::WEBSERVER));
QThread* wsThread = new QThread(this);