Testing time!
Also new: Effects dirs are now created automatically
This commit is contained in:
brindosch
2017-05-29 15:59:11 +02:00
parent 64fc6a9003
commit e2ca9bcaa5
7 changed files with 213 additions and 1 deletions

View File

@@ -50,6 +50,7 @@ HyperionDaemon::HyperionDaemon(QString configFile, QObject *parent)
, _fbGrabber(nullptr)
, _osxGrabber(nullptr)
, _hyperion(nullptr)
, _stats(nullptr)
{
loadConfig(configFile, CURRENT_CONFIG_VERSION );
@@ -99,6 +100,7 @@ void HyperionDaemon::freeObjects()
delete _protoServer;
delete _boblightServer;
delete _udpListener;
delete _stats;
_v4l2Grabbers.clear();
_amlGrabber = nullptr;
@@ -110,6 +112,7 @@ void HyperionDaemon::freeObjects()
_protoServer = nullptr;
_boblightServer = nullptr;
_udpListener = nullptr;
_stats = nullptr;
}
void HyperionDaemon::run()
@@ -302,6 +305,9 @@ void HyperionDaemon::startNetworkServices()
{
KODIVideoChecker* kodiVideoChecker = KODIVideoChecker::getInstance();
// Create Stats
_stats = new Stats();
// Create Json server if configuration is present
unsigned int jsonPort = 19444;
if (_qconfig.contains("jsonServer"))

View File

@@ -45,6 +45,7 @@
#include <protoserver/ProtoServer.h>
#include <boblightserver/BoblightServer.h>
#include <udplistener/UDPListener.h>
#include <utils/Stats.h>
#include <QJsonObject>
class HyperionDaemon : public QObject
@@ -92,6 +93,7 @@ private:
FramebufferWrapper* _fbGrabber;
OsxWrapper* _osxGrabber;
Hyperion* _hyperion;
Stats* _stats;
unsigned _grabber_width;
unsigned _grabber_height;