JsonUtils & improvements (#476)

* 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

View File

@@ -319,17 +319,18 @@
{
"enable" : true,
"document_root" : "/path/to/files",
"port" : 8099
"port" : 8090
},
/// The configuration of the effect engine, contains the following items:
/// * paths : An array with absolute/relative location(s) of directories with effects
/// * paths : An array with absolute location(s) of directories with effects,
/// $ROOT is a keyword which will be replaced with the current rootPath that can be specified on startup from the commandline (defaults to your home directory)
/// * disable : An array with effect names that shouldn't be loaded
"effects" :
{
"paths" :
[
"/storage/hyperion/effects",
"$ROOT/custom-effects",
"/usr/share/hyperion/effects"
],
"disable" :

View File

@@ -181,12 +181,12 @@
{
"enable" : true,
"document_root" : "",
"port" : 8099
"port" : 8090
},
"effects" :
{
"paths" : ["../custom-effects"],
"paths" : ["$ROOT/custom-effects"],
"disable": [""]
},