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

JsonUtils & improvements (#476)

Browse Source 
* add JsonUtils

* update

* repair

* update

* ident

* Schema correct msg other adjusts

* fix effDel, ExceptionLog, cleanup

* fix travis qt5.2

* not so funny

* use Qthread interrupt instead abort bool

* update services
This commit is contained in:
brindosch
2017-10-12 11:55:03 +02:00
committed by GitHub
parent 47641012ee
commit 838008568a
42 changed files with 940 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/hyperiond/hyperiond.h
View File

@@ -58,7 +58,7 @@ class HyperionDaemon : public QObject
friend SysTray;
public:
HyperionDaemon(QString configFile, QObject *parent=nullptr);
HyperionDaemon(QString configFile, QString rootPath, QObject *parent=nullptr);
~HyperionDaemon();
void loadConfig(const QString & configFile);
@@ -95,11 +95,11 @@ private:
X11Wrapper* _x11Grabber;
#endif
AmlogicWrapper* _amlGrabber;
FramebufferWrapper* _fbGrabber;
FramebufferWrapper* _fbGrabber;
OsxWrapper* _osxGrabber;
Hyperion* _hyperion;
Stats* _stats;
unsigned _grabber_width;
unsigned _grabber_height;
unsigned _grabber_frequency;