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

remove protobuf (part 2)

Browse Source
This commit is contained in:
Paulchen-Panther
2018-12-30 22:07:53 +01:00
parent 559311e18c
commit 38950edf35
54 changed files with 1441 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/hyperion/LinearColorSmoothing.cpp
View File

@@ -23,8 +23,6 @@ LinearColorSmoothing::LinearColorSmoothing( LedDevice * ledDevice, const QJsonDo
, _pause(false)
, _currentConfigId(0)
{
Debug(_log, "Instance created");
// set initial state to true, as LedDevice::enabled() is true by default
_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_SMOOTHING, true);

2
libsrc/hyperion/MessageForwarder.cpp
View File

@@ -98,7 +98,7 @@ void MessageForwarder::addProtoSlave(QString slave)
}
// verify loop with protoserver
const QJsonObject& obj = _hyperion->getSetting(settings::PROTOSERVER).object();
const QJsonObject& obj = _hyperion->getSetting(settings::FLATBUFSERVER).object();
if(QHostAddress(parts[0]) == QHostAddress::LocalHost && parts[1].toInt() == obj["port"].toInt())
{
Error(_log, "Loop between ProtoServer and Forwarder! (%s)",QSTRING_CSTR(slave));

2
libsrc/hyperion/SettingsManager.cpp
View File

@@ -20,11 +20,11 @@ SettingsManager::SettingsManager(Hyperion* hyperion, const quint8& instance, con
: _hyperion(hyperion)
, _log(Logger::getInstance("SettingsManager"))
{
Q_INIT_RESOURCE(resource);
connect(this, &SettingsManager::settingsChanged, _hyperion, &Hyperion::settingsChanged);
// get schema
if(schemaJson.isEmpty())
{
Q_INIT_RESOURCE(resource);
try
{
schemaJson = QJsonFactory::readSchema(":/hyperion-schema");

4
libsrc/hyperion/hyperion.schema.json
View File

@@ -51,10 +51,6 @@
{
"$ref": "schema-jsonServer.json"
},
"protoServer" :
{
"$ref": "schema-protoServer.json"
},
"flatbufServer":
{
"$ref": "schema-flatbufServer.json"

1
libsrc/hyperion/resource.qrc
View File

@@ -15,7 +15,6 @@
<file alias="schema-backgroundEffect.json">schema/schema-backgroundEffect.json</file>
<file alias="schema-forwarder.json">schema/schema-forwarder.json</file>
<file alias="schema-jsonServer.json">schema/schema-jsonServer.json</file>
<file alias="schema-protoServer.json">schema/schema-protoServer.json</file>
<file alias="schema-flatbufServer.json">schema/schema-flatbufServer.json</file>
<file alias="schema-boblightServer.json">schema/schema-boblightServer.json</file>
<file alias="schema-udpListener.json">schema/schema-udpListener.json</file>