sourceOff feature + small json refactoring (#151)

* add --sourceOff to hyperion-remote - this will select "off" source and set all leds to black
refactor new json stuff
make schema checker not so strict, do not require values that have defaults (not finished yet)
initialEffect config: effect is always an array, regardless if it is a color or an effect name

* make off source visible in active priority list

* transform initialeffect to qjson (except part of effect-args, this needs effectengine transformed to qjson)

* remove unneeded comment

* add web ui for source selection.
call http://hyperion_host:8099/select/index.html
current example needed json server on port 19444

src/hyperion-remote/hyperion-remote.cpp

@@ -1,6 +1,7 @@
 // stl includes
 #include <clocale>
 #include <initializer_list>
+#include <limits>
 
 // Qt includes
 #include <QCoreApplication>
@@ -85,6 +86,7 @@ int main(int argc, char * argv[])
 		AdjustmentParameter & argBAdjust = parameters.add<AdjustmentParameter>('B', "blueAdjustment", "Set the adjustment of the blue color (requires 3 space seperated values between 0 and 255)");
 		IntParameter       & argSource   = parameters.add<IntParameter>      (0x0, "sourceSelect"  , "Set current active priority channel and deactivate auto source switching");
 		SwitchParameter<>  & argSourceAuto = parameters.add<SwitchParameter<> >(0x0, "sourceAutoSelect", "Enables auto source, if disabled prio by manual selecting input source");
+		SwitchParameter<>  & argSourceOff = parameters.add<SwitchParameter<> >(0x0, "sourceOff", "select no source, this results in leds activly set to black (=off)");
 		SwitchParameter<>  & argConfigGet   = parameters.add<SwitchParameter<> >(0x0, "configget"  , "Print the current loaded Hyperion configuration file");
 
 		// set the default values
@@ -109,7 +111,7 @@ int main(int argc, char * argv[])
 		bool colorModding = colorTransform || colorAdjust || argCorrection.isSet() || argTemperature.isSet();
 		
 		// check that exactly one command was given
-        int commandCount = count({argColor.isSet(), argImage.isSet(), argEffect.isSet(), argServerInfo.isSet(), argClear.isSet(), argClearAll.isSet(), argEnableComponent.isSet(), argDisableComponent.isSet(), colorModding, argSource.isSet(), argSourceAuto.isSet(), argConfigGet.isSet()});
+        int commandCount = count({argColor.isSet(), argImage.isSet(), argEffect.isSet(), argServerInfo.isSet(), argClear.isSet(), argClearAll.isSet(), argEnableComponent.isSet(), argDisableComponent.isSet(), colorModding, argSource.isSet(), argSourceAuto.isSet(), argSourceOff.isSet(), argConfigGet.isSet()});
 		if (commandCount != 1)
 		{
 			std::cerr << (commandCount == 0 ? "No command found." : "Multiple commands found.") << " Provide exactly one of the following options:" << std::endl;
@@ -183,6 +185,10 @@ int main(int argc, char * argv[])
 		{
 			connection.setComponentState(argDisableComponent.getValue(), false);
 		}
+		else if (argSourceOff.isSet())
+		{
+			connection.setSource(std::numeric_limits<int>::max());
+		}
 		else if (argSource.isSet())
 		{
 			connection.setSource(argSource.getValue());

src/hyperiond/hyperiond.cpp

@@ -21,6 +21,7 @@
 #include <utils/jsonschema/QJsonFactory.h>
 
 #include <hyperion/Hyperion.h>
+#include <hyperion/PriorityMuxer.h>
 #include <effectengine/EffectEngine.h>
 #include <bonjour/bonjourserviceregister.h>
 #include <bonjour/bonjourrecord.h>
@@ -32,7 +33,7 @@
 #include "hyperiond.h"
 
 
-HyperionDaemon::HyperionDaemon(std::string configFile, QObject *parent)
+HyperionDaemon::HyperionDaemon(QString configFile, QObject *parent)
 	: QObject(parent)
 	, _log(Logger::getInstance("MAIN"))
 	, _kodiVideoChecker(nullptr)
@@ -48,10 +49,9 @@ HyperionDaemon::HyperionDaemon(std::string configFile, QObject *parent)
 	, _osxGrabber(nullptr)
 	, _hyperion(nullptr)
 {
-	loadConfig(configFile); // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
-	loadConfig(QString::fromStdString(configFile));
+	loadConfig(configFile);
 	
-	_hyperion = Hyperion::initInstance(_config, configFile);
+	_hyperion = Hyperion::initInstance(_config, configFile.toStdString());
 	
 	if (Logger::getLogLevel() == Logger::WARNING)
 	{
@@ -72,7 +72,7 @@ HyperionDaemon::HyperionDaemon(std::string configFile, QObject *parent)
 		WarningIf(_qconfig.contains("logger"), Logger::getInstance("LOGGER"), "Logger settings overriden by command line argument");
 	}
 	
-	Info(_log, "Hyperion started and initialised");
+	Info(_log, "Hyperion initialised");
 }
 
 HyperionDaemon::~HyperionDaemon()
@@ -106,35 +106,14 @@ void HyperionDaemon::run()
 	#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB) && !defined(ENABLE_X11) && !defined(ENABLE_AMLOGIC)
 		WarningIf(_qconfig.contains("framegrabber"), _log, "No grabber can be instantiated, because all grabbers have been left out from the build");
 	#endif
+	Info(_log, "Hyperion started");
 
-}
 
-void HyperionDaemon::loadConfig(const std::string & configFile) // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
-{
-	Info(_log, "Selected configuration file: %s", configFile.c_str() );
-	// make sure the resources are loaded (they may be left out after static linking)
-	Q_INIT_RESOURCE(resource);
-
-	// read the json schema from the resource
-	QResource schemaData(":/hyperion-schema");
-	assert(schemaData.isValid());
-
-	Json::Reader jsonReader;
-	Json::Value schemaJson;
-	if (!jsonReader.parse(reinterpret_cast<const char *>(schemaData.data()), reinterpret_cast<const char *>(schemaData.data()) + schemaData.size(), schemaJson, false))
-	{
-		throw std::runtime_error("ERROR: Json schema wrong: " + jsonReader.getFormattedErrorMessages())	;
-	}
-	JsonSchemaChecker schemaChecker;
-	schemaChecker.setSchema(schemaJson);
-
-	_config = JsonFactory::readJson(configFile);
-	schemaChecker.validate(_config);
 }
 
 void HyperionDaemon::loadConfig(const QString & configFile)
 {
-//	Info(_log, "Selected configuration file: %s", configFile.toStdString().c_str()); // uncommend this line only if JsonCpp is removed. Otherwise appears this line twice in the debug output
+	Info(_log, "Selected configuration file: %s", configFile.toUtf8().constData());
 
 	// make sure the resources are loaded (they may be left out after static linking)
 	Q_INIT_RESOURCE(resource);
@@ -176,6 +155,7 @@ void HyperionDaemon::loadConfig(const QString & configFile)
 	QJsonSchemaChecker schemaChecker;
 	schemaChecker.setSchema(schemaJson.object());
 
+	_config  = JsonFactory::readJson(configFile.toStdString()); // DEPRECATED | Remove this only when the conversion have been completed from JsonCpp to QTJson
 	_qconfig = QJsonFactory::readJson(configFile);
 	if (!schemaChecker.validate(_qconfig))
 	{
@@ -190,68 +170,76 @@ void HyperionDaemon::loadConfig(const QString & configFile)
 
 void HyperionDaemon::startInitialEffect()
 {
+	#define FGCONFIG_ARRAY fgEffectConfig.toArray()
+	#define BGCONFIG_ARRAY bgEffectConfig.toArray()
+
 	Hyperion *hyperion = Hyperion::getInstance();
 
 	// create boot sequence if the configuration is present
 	if (_config.isMember("initialEffect"))
 	{
-		const Json::Value effectConfig = _config["initialEffect"];
-		const int HIGHEST_PRIORITY = 0;
+		const QJsonObject & effectConfig = _qconfig["initialEffect"].toObject();
+		const int FG_PRIORITY = 0;
 		const int DURATION_INFINITY = 0;
-		const int LOWEST_PRIORITY = std::numeric_limits<int>::max()-1;
+		const int BG_PRIORITY = PriorityMuxer::LOWEST_PRIORITY -1;
 
 		// clear the leds
-		hyperion->setColor(HIGHEST_PRIORITY, ColorRgb::BLACK, DURATION_INFINITY, false);
+		hyperion->setColor(FG_PRIORITY, ColorRgb::BLACK, DURATION_INFINITY, false);
 
 		// initial foreground effect/color
-		const Json::Value fgEffectConfig = effectConfig["foreground-effect"];
+		const QJsonValue fgEffectConfig = effectConfig["foreground-effect"];
 		int default_fg_duration_ms = 3000;
-		int fg_duration_ms = effectConfig.get("foreground-effect-duration_ms",default_fg_duration_ms).asUInt();
+		int fg_duration_ms = effectConfig["foreground-effect-duration_ms"].toInt(default_fg_duration_ms);
 		if (fg_duration_ms == DURATION_INFINITY)
 		{
 			fg_duration_ms = default_fg_duration_ms;
 			Warning(_log, "foreground effect duration 'infinity' is forbidden, set to default value %d ms",default_fg_duration_ms);
 		}
-		if ( ! fgEffectConfig.isNull() && fgEffectConfig.isArray() && fgEffectConfig.size() == 3 )
+		if ( ! fgEffectConfig.isNull() && fgEffectConfig.isArray() && FGCONFIG_ARRAY.size() == 3 )
 		{
 			ColorRgb fg_color = {
-				(uint8_t)fgEffectConfig[0].asUInt(),
-				(uint8_t)fgEffectConfig[1].asUInt(),
-				(uint8_t)fgEffectConfig[2].asUInt()
+				(uint8_t)FGCONFIG_ARRAY.at(0).toInt(0),
+				(uint8_t)FGCONFIG_ARRAY.at(1).toInt(0),
+				(uint8_t)FGCONFIG_ARRAY.at(2).toInt(0)
 			};
-			hyperion->setColor(HIGHEST_PRIORITY, fg_color, fg_duration_ms, false);
+			hyperion->setColor(FG_PRIORITY, fg_color, fg_duration_ms, false);
 			Info(_log,"Inital foreground color set (%d %d %d)",fg_color.red,fg_color.green,fg_color.blue);
 		}
-		else if (! fgEffectConfig.isNull() && fgEffectConfig.isString())
+		else if (! fgEffectConfig.isNull() && fgEffectConfig.isArray() && FGCONFIG_ARRAY.size() == 1 && FGCONFIG_ARRAY.at(0).isString())
 		{
-			const std::string bgEffectName = fgEffectConfig.asString();
-			int result = effectConfig.isMember("foreground-effect-args")
-			           ? hyperion->setEffect(bgEffectName, effectConfig["foreground-effect-args"], HIGHEST_PRIORITY, fg_duration_ms)
-			           : hyperion->setEffect(bgEffectName, HIGHEST_PRIORITY, fg_duration_ms);
-			Info(_log,"Inital foreground effect '%s' %s", bgEffectName.c_str(), ((result == 0) ? "started" : "failed"));
+			const std::string fgEffectName = FGCONFIG_ARRAY.at(0).toString().toStdString();
+			int result = effectConfig.contains("foreground-effect-args")
+//			           ? hyperion->setEffect(fgEffectName, effectConfig["foreground-effect-args"], FG_PRIORITY, fg_duration_ms)
+			           ? hyperion->setEffect(fgEffectName, _config["initialEffect"]["foreground-effect-args"], FG_PRIORITY, fg_duration_ms)
+			           : hyperion->setEffect(fgEffectName, FG_PRIORITY, fg_duration_ms);
+			Info(_log,"Inital foreground effect '%s' %s", fgEffectName.c_str(), ((result == 0) ? "started" : "failed"));
 		}
 
 		// initial background effect/color
-		const Json::Value bgEffectConfig = effectConfig["background-effect"];
-		if ( ! bgEffectConfig.isNull() && bgEffectConfig.isArray() && bgEffectConfig.size() == 3 )
+		const QJsonValue bgEffectConfig = effectConfig["background-effect"];
+		if ( ! bgEffectConfig.isNull() && bgEffectConfig.isArray() && BGCONFIG_ARRAY.size() == 3 )
 		{
 			ColorRgb bg_color = {
-				(uint8_t)bgEffectConfig[0].asUInt(),
-				(uint8_t)bgEffectConfig[1].asUInt(),
-				(uint8_t)bgEffectConfig[2].asUInt()
+				(uint8_t)BGCONFIG_ARRAY.at(0).toInt(0),
+				(uint8_t)BGCONFIG_ARRAY.at(1).toInt(0),
+				(uint8_t)BGCONFIG_ARRAY.at(2).toInt(0)
 			};
-			hyperion->setColor(LOWEST_PRIORITY, bg_color, DURATION_INFINITY, false);
+			hyperion->setColor(BG_PRIORITY, bg_color, DURATION_INFINITY, false);
 			Info(_log,"Inital background color set (%d %d %d)",bg_color.red,bg_color.green,bg_color.blue);
 		}
-		else if (! bgEffectConfig.isNull() && bgEffectConfig.isString())
+		else if (! bgEffectConfig.isNull() && bgEffectConfig.isArray() && BGCONFIG_ARRAY.size() == 1 && BGCONFIG_ARRAY.at(0).isString())
 		{
-			const std::string bgEffectName = bgEffectConfig.asString();
-			int result = effectConfig.isMember("background-effect-args")
-			           ? hyperion->setEffect(bgEffectName, effectConfig["background-effect-args"], LOWEST_PRIORITY, DURATION_INFINITY)
-			           : hyperion->setEffect(bgEffectName, LOWEST_PRIORITY, DURATION_INFINITY);
+			const std::string bgEffectName = BGCONFIG_ARRAY.at(0).toString().toStdString();
+			int result = effectConfig.contains("background-effect-args")
+//			           ? hyperion->setEffect(bgEffectName, effectConfig["background-effect-args"], BG_PRIORITY, fg_duration_ms)
+			           ? hyperion->setEffect(bgEffectName, _config["initialEffect"]["background-effect-args"], BG_PRIORITY, DURATION_INFINITY)
+			           : hyperion->setEffect(bgEffectName, BG_PRIORITY, DURATION_INFINITY);
 			Info(_log,"Inital background effect '%s' %s", bgEffectName.c_str(), ((result == 0) ? "started" : "failed"));
 		}
 	}
+	
+	#undef FGCONFIG_ARRAY
+	#undef BGCONFIG_ARRAY
 }
 
 
@@ -271,7 +259,7 @@ void HyperionDaemon::createKODIVideoChecker()
 		videoCheckerConfig["grabPause"].toBool(true),
 		videoCheckerConfig["grabScreensaver"].toBool(false),
 		videoCheckerConfig["enable3DDetection"].toBool(true));
-		Debug(_log, "KODI checker created ");
+	Debug(_log, "KODI checker created ");
 
 	if( kodiCheckerConfigured && videoCheckerConfig["enable"].toBool(true))
 	{

src/hyperiond/hyperiond.h

@@ -51,10 +51,9 @@
 class HyperionDaemon : public QObject
 {
 public:
-	HyperionDaemon(std::string configFile, QObject *parent=nullptr);
+	HyperionDaemon(QString configFile, QObject *parent=nullptr);
 	~HyperionDaemon();
 	
-	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();
 

src/hyperiond/main.cpp

@@ -7,6 +7,7 @@
 #include <QCoreApplication>
 #include <QLocale>
 #include <QFile>
+#include <QString>
 
 #include "HyperionConfig.h"
 
@@ -143,7 +144,7 @@ int main(int argc, char** argv)
 	HyperionDaemon* hyperiond = nullptr;
 	try
 	{
-		hyperiond = new HyperionDaemon(configFiles[argvId], &app);
+		hyperiond = new HyperionDaemon(QString::fromStdString(configFiles[argvId]), &app);
 		hyperiond->run();
 	}
 	catch (std::exception& e)