second part of PR #578

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther
2019-07-14 22:43:22 +02:00
parent ea796160af
commit 90599e820a
52 changed files with 2354 additions and 536 deletions

View File

@@ -46,13 +46,13 @@
#endif
#include <utils/Logger.h>
#include <utils/Image.h>
#include <utils/VideoMode.h>
// settings management
#include <utils/settings.h>
#include <utils/Components.h>
class Hyperion;
class HyperionIManager;
class SysTray;
class JsonServer;
class UDPListener;
@@ -73,7 +73,7 @@ class HyperionDaemon : public QObject
friend SysTray;
public:
HyperionDaemon(QString configFile, QString rootPath, QObject *parent, const bool& logLvlOverwrite );
HyperionDaemon(QString rootPath, QObject *parent, const bool& logLvlOverwrite );
~HyperionDaemon();
///
@@ -100,15 +100,28 @@ public slots:
void freeObjects();
signals:
///////////////////////////////////////
/// FROM HYPERIONDAEMON TO HYPERION ///
///////////////////////////////////////
///
/// @brief After eval of setVideoMode this signal emits with a new one on change
///
void videoMode(const VideoMode& mode);
///////////////////////////////////////
/// FROM HYPERION TO HYPERIONDAEMON ///
///////////////////////////////////////
///
/// @brief PIPE settings events from Hyperion class to HyperionDaemon components
///
void settingsChanged(const settings::type& type, const QJsonDocument& data);
///
/// @brief After eval of setVideoMode this signal emits with a new one on change
/// @brief PIPE component state changes events from Hyperion class to HyperionDaemon components
///
void videoMode(const VideoMode& mode);
void componentStateChanged(const hyperion::Components component, bool enable);
private slots:
///
@@ -133,6 +146,7 @@ private:
void createGrabberQt(const QJsonObject & grabberConfig);
Logger* _log;
HyperionIManager* _instanceManager;
AuthManager* _authManager;
BonjourBrowserWrapper* _bonjourBrowserWrapper;
NetOrigin* _netOrigin;
@@ -147,7 +161,6 @@ private:
FramebufferWrapper* _fbGrabber;
OsxWrapper* _osxGrabber;
QtWrapper* _qtGrabber;
Hyperion* _hyperion;
SSDPHandler* _ssdp;
FlatBufferServer* _flatBufferServer;
ProtoServer* _protoServer;