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

JsonCpp to QTJson (Part 2) (#147)

Browse Source 
* Replace std::string with QString

* Replace std::string with QString

* Replace std::string with QString

* Replace std::string with QString

* Convert JsonCPP Code to QTJson

Not all JsonCPP Code is converted to QTJson Code. See Pull Request for Details.

* Convert JsonCPP Code to QTJson

Not all JsonCPP Code is converted to QTJson Code. See Pull Request for Details.
This commit is contained in:
Paulchen-Panther
2016-08-04 10:53:26 +02:00
committed by brindosch
parent 0e2f0127fd
commit f183032270
6 changed files with 171 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/hyperiond/hyperiond.h
View File

@@ -46,6 +46,7 @@
#include <boblightserver/BoblightServer.h>
#include <webconfig/WebConfig.h>
#include <udplistener/UDPListener.h>
#include <QJsonObject>
class HyperionDaemon : public QObject
{
@@ -53,7 +54,8 @@ public:
HyperionDaemon(std::string configFile, QObject *parent=nullptr);
~HyperionDaemon();
void loadConfig(const std::string & configFile);
void loadConfig(const std::string & configFile); // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
void loadConfig(const QString & configFile);
void run();
void startInitialEffect();
@@ -67,12 +69,13 @@ public:
private:
void createGrabberDispmanx();
void createGrabberAmlogic();
void createGrabberFramebuffer(const Json::Value & grabberConfig);
void createGrabberOsx(const Json::Value & grabberConfig);
void createGrabberX11(const Json::Value & grabberConfig);
void createGrabberFramebuffer(const QJsonObject & grabberConfig);
void createGrabberOsx(const QJsonObject & grabberConfig);
void createGrabberX11(const QJsonObject & grabberConfig);
Logger* _log;
Json::Value _config;
Json::Value _config; // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
QJsonObject _qconfig;
KODIVideoChecker* _kodiVideoChecker;
JsonServer* _jsonServer;
ProtoServer* _protoServer;