Merge branch 'master' into add_effect_engine

Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48

include/hyperion/ColorTransform.h

@@ -0,0 +1,26 @@
+#pragma once
+
+// STL includes
+#include <string>
+
+// Utils includes
+#include <utils/RgbChannelTransform.h>
+#include <utils/HsvTransform.h>
+
+class ColorTransform
+{
+public:
+
+	/// Unique identifier for this color transform
+	std::string _id;
+
+	/// The RED-Channel (RGB) transform
+	RgbChannelTransform _rgbRedTransform;
+	/// The GREEN-Channel (RGB) transform
+	RgbChannelTransform _rgbGreenTransform;
+	/// The BLUE-Channel (RGB) transform
+	RgbChannelTransform _rgbBlueTransform;
+
+	/// The HSV Transform for applying Saturation and Value transforms
+	HsvTransform _hsvTransform;
+};

include/utils/RgbChannelTransform.h

@@ -12,21 +12,21 @@
 /// 4) finally, in case of a weird choice of parameters, the output is clamped between [0:1]
 ///
 /// All configuration values are doubles and assume the color value to be between 0 and 1
-class ColorTransform
+class RgbChannelTransform
 {
 public:
 	/// Default constructor
-	ColorTransform();
+	RgbChannelTransform();
 
 	/// Constructor
-	/// @param threshold
-	/// @param gamma
-	/// @param blacklevel
-	/// @param whitelevel
-	ColorTransform(double threshold, double gamma, double blacklevel, double whitelevel);
+	/// @param threshold  The minimum threshold
+	/// @param gamma The gamma of the gamma-curve correction
+	/// @param blacklevel The minimum value for the RGB-Channel
+	/// @param whitelevel The maximum value for the RGB-Channel
+	RgbChannelTransform(double threshold, double gamma, double blacklevel, double whitelevel);
 
 	/// Destructor
-	~ColorTransform();
+	~RgbChannelTransform();
 
 	/// @return The current threshold value
 	double getThreshold() const;