hyperion-project · Paulchen-Panther · Jul 12, 2020 · Jul 3, 2020
diff --git a/include/api/JsonAPI.h b/include/api/JsonAPI.h
@@ -85,7 +85,7 @@ private slots:
 	/// @param instance      The index of instance
 	/// @param name          The name of the instance, just available with H_CREATED
 	///
-	void handleInstanceStateChange(const instanceState &state, const quint8 &instance, const QString &name = QString());
+	void handleInstanceStateChange(const InstanceState &state, const quint8 &instance, const QString &name = QString());
 
 signals:
 	///

diff --git a/include/grabber/AmlogicGrabber.h b/include/grabber/AmlogicGrabber.h
@@ -18,7 +18,7 @@ class AmlogicGrabber : public Grabber
 	/// @param[in] height The heigth of the captured screenshot
 	///
 	AmlogicGrabber(const unsigned width, const unsigned height);
-	~AmlogicGrabber();
+	~AmlogicGrabber() override;
 
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The

diff --git a/include/grabber/AmlogicWrapper.h b/include/grabber/AmlogicWrapper.h
@@ -20,11 +20,6 @@ class AmlogicWrapper : public GrabberWrapper
 	///
 	AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight);
 
-	///
-	/// Destructor of this dispmanx frame grabber. Releases any claimed resources.
-	///
-	virtual ~AmlogicWrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/grabber/DispmanxFrameGrabber.h b/include/grabber/DispmanxFrameGrabber.h
@@ -27,7 +27,7 @@ class DispmanxFrameGrabber : public Grabber
 	/// @param[in] height The heigth of the captured screenshot
 	///
 	DispmanxFrameGrabber(const unsigned width, const unsigned height);
-	~DispmanxFrameGrabber();
+	~DispmanxFrameGrabber() override;
 
 
 	///

diff --git a/include/grabber/DispmanxFrameGrabberMock.h b/include/grabber/DispmanxFrameGrabberMock.h
@@ -36,5 +36,4 @@ int  vc_dispmanx_resource_read_data(DISPMANX_RESOURCE_HANDLE_T vc_resource, VC_R
 void vc_dispmanx_rect_set(VC_RECT_T *rectangle, int left, int top, int width, int height);
 int vc_dispmanx_snapshot(int, DISPMANX_RESOURCE_HANDLE_T resource, int vc_flags);
 
-
 #endif
diff --git a/include/grabber/DispmanxWrapper.h b/include/grabber/DispmanxWrapper.h
@@ -22,11 +22,6 @@ class DispmanxWrapper: public GrabberWrapper
 	///
 	DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz);
 
-	///
-	/// Destructor of this dispmanx frame grabber. Releases any claimed resources.
-	///
-	virtual ~DispmanxWrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/grabber/FramebufferFrameGrabber.h b/include/grabber/FramebufferFrameGrabber.h
@@ -18,7 +18,6 @@ class FramebufferFrameGrabber : public Grabber
 	/// @param[in] height The heigth of the captured screenshot
 	///
 	FramebufferFrameGrabber(const QString & device, const unsigned width, const unsigned height);
-	~FramebufferFrameGrabber();
 
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
@@ -36,12 +35,6 @@ class FramebufferFrameGrabber : public Grabber
 	virtual void setDevicePath(const QString& path);
 
 private:
-	/// Framebuffer file descriptor
-	int _fbfd;
-
-	/// Pointer to framebuffer
-	unsigned char * _fbp;
-
 	/// Framebuffer device e.g. /dev/fb0
 	QString _fbDevice;
 };
diff --git a/include/grabber/FramebufferWrapper.h b/include/grabber/FramebufferWrapper.h
@@ -22,11 +22,6 @@ class FramebufferWrapper: public GrabberWrapper
 	///
 	FramebufferWrapper(const QString & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz);
 
-	///
-	/// Destructor of this framebuffer frame grabber. Releases any claimed resources.
-	///
-	virtual ~FramebufferWrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/grabber/OsxFrameGrabber.h b/include/grabber/OsxFrameGrabber.h
@@ -25,7 +25,7 @@ class OsxFrameGrabber : public Grabber
 	/// @param[in] height The heigth of the captured screenshot
 	///
 	OsxFrameGrabber(const unsigned display, const unsigned width, const unsigned height);
-	~OsxFrameGrabber();
+	~OsxFrameGrabber() override;
 
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The

diff --git a/include/grabber/OsxWrapper.h b/include/grabber/OsxWrapper.h
@@ -22,11 +22,6 @@ class OsxWrapper: public GrabberWrapper
 	///
 	OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz);
 
-	///
-	/// Destructor of this osx frame grabber. Releases any claimed resources.
-	///
-	virtual ~OsxWrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/grabber/QtGrabber.h b/include/grabber/QtGrabber.h
@@ -17,7 +17,7 @@ class QtGrabber : public Grabber
 
 	QtGrabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display);
 
-	virtual ~QtGrabber();
+	~QtGrabber() override;
 
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The

diff --git a/include/grabber/QtWrapper.h b/include/grabber/QtWrapper.h
@@ -21,11 +21,6 @@ class QtWrapper: public GrabberWrapper
 	///
 	QtWrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display, const unsigned updateRate_Hz);
 
-	///
-	/// Destructor of this qt frame grabber. Releases any claimed resources.
-	///
-	virtual ~QtWrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/grabber/V4L2Wrapper.h b/include/grabber/V4L2Wrapper.h
@@ -16,7 +16,6 @@ class V4L2Wrapper : public GrabberWrapper
 			VideoStandard videoStandard,
 			PixelFormat pixelFormat,
 			int pixelDecimation );
-	virtual ~V4L2Wrapper() {};
 
 	bool getSignalDetectionEnable();
 

diff --git a/include/grabber/X11Grabber.h b/include/grabber/X11Grabber.h
@@ -19,7 +19,7 @@ class X11Grabber : public Grabber
 
 	X11Grabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation);
 
-	virtual ~X11Grabber();
+	~X11Grabber() override;
 
 	bool Setup();
 

diff --git a/include/grabber/X11Wrapper.h b/include/grabber/X11Wrapper.h
@@ -26,11 +26,6 @@ class X11Wrapper: public GrabberWrapper
 	///
 	X11Wrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, const unsigned updateRate_Hz);
 
-	///
-	/// Destructor of this framebuffer frame grabber. Releases any claimed resources.
-	///
-	virtual ~X11Wrapper() {};
-
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

diff --git a/include/hyperion/CaptureCont.h b/include/hyperion/CaptureCont.h
@@ -17,7 +17,6 @@ class CaptureCont : public QObject
 	Q_OBJECT
 public:
 	CaptureCont(Hyperion* hyperion);
-	~CaptureCont();
 
 	void setSystemCaptureEnable(const bool& enable);
 	void setV4LCaptureEnable(const bool& enable);

diff --git a/include/hyperion/Grabber.h b/include/hyperion/Grabber.h
@@ -23,7 +23,6 @@ class Grabber : public QObject
 
 public:
 	Grabber(QString grabberName = "", int width=0, int height=0, int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);
-	virtual ~Grabber();
 
 	///
 	/// Set the video mode (2D/3D)

diff --git a/include/hyperion/Hyperion.h b/include/hyperion/Hyperion.h
@@ -2,7 +2,6 @@
 
 // stl includes
 #include <list>
-#include <QMap>
 
 // QT includes
 #include <QString>
@@ -11,6 +10,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonArray>
+#include <QMap>
 #include <QMutex>
 
 // hyperion-utils includes
@@ -59,32 +59,25 @@ class Hyperion : public QObject
 	Q_OBJECT
 public:
 	///  Type definition of the info structure used by the priority muxer
-	typedef PriorityMuxer::InputInfo InputInfo;
-	///
-	/// RGB-Color channel enumeration
-	///
-	enum RgbChannel
-	{
-		BLACK, WHITE, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, INVALID
-	};
+	using InputInfo = PriorityMuxer::InputInfo;
 
 	///
 	/// Destructor; cleans up resources
 	///
-	virtual ~Hyperion();
+	~Hyperion() override;
 
 	///
 	/// free all alocated objects, should be called only from constructor or before restarting hyperion
 	///
 	void freeObjects(bool emitCloseSignal=false);
 
-	ImageProcessor* getImageProcessor() { return _imageProcessor; };
+	ImageProcessor* getImageProcessor() { return _imageProcessor; }
 
 	///
 	/// @brief Get instance index of this instance
 	/// @return The index of this instance
 	///
-	const quint8 & getInstanceIndex() { return _instIndex; };
+	const quint8 & getInstanceIndex() { return _instIndex; }
 
 	///
 	/// Returns the number of attached leds
@@ -94,7 +87,7 @@ class Hyperion : public QObject
 	///
 	/// @brief Return the size of led grid
 	///
-	QSize getLedGridSize() const { return _ledGridSize; };
+	QSize getLedGridSize() const { return _ledGridSize; }
 
 	/// gets the methode how image is maped to leds
 	const int & getLedMappingType();
@@ -110,8 +103,8 @@ class Hyperion : public QObject
 
 	///
 	/// @brief Get the current active led device
-	/// @return The device nam
-	/// e
+	/// @return The device name
+	///
 	const QString & getActiveDeviceType();
 
 	///
@@ -206,7 +199,7 @@ public slots:
 	/// @return     EffectEngine instance pointer
 	///
 
-	EffectEngine* getEffectEngineInstance() { return _effectEngine; };
+	EffectEngine* getEffectEngineInstance() { return _effectEngine; }
 	///
 	/// @brief Save an effect
 	/// @param  obj  The effect args
@@ -259,7 +252,7 @@ public slots:
 	/// @brief Get a pointer to the priorityMuxer instance
 	/// @return      PriorityMuxer instance pointer
 	///
-	PriorityMuxer* getMuxerInstance() { return &_muxer; };
+	PriorityMuxer* getMuxerInstance() { return &_muxer; }
 
 	///
 	/// @brief enable/disable automatic/priorized source selection
@@ -335,7 +328,7 @@ public slots:
 	/// @brief Get the component Register
 	/// return Component register pointer
 	///
-	ComponentRegister& getComponentRegister() { return _componentRegister; };
+	ComponentRegister& getComponentRegister() { return _componentRegister; }
 
 	///
 	/// @brief Called from components to update their current state. DO NOT CALL FROM USERS
@@ -489,7 +482,7 @@ private slots:
 	///
 	/// @brief Apply new videoMode from Daemon to _currVideoMode
 	///
-	void handleNewVideoMode(const VideoMode& mode) { _currVideoMode = mode; };
+	void handleNewVideoMode(const VideoMode& mode) { _currVideoMode = mode; }
 
 private:
 	friend class HyperionDaemon;

diff --git a/include/hyperion/HyperionIManager.h b/include/hyperion/HyperionIManager.h
@@ -12,7 +12,7 @@
 class Hyperion;
 class InstanceTable;
 
-enum instanceState{
+enum class InstanceState{
 	H_STARTED,
 	H_ON_STOP,
 	H_STOPPED,
@@ -29,7 +29,7 @@ class HyperionIManager : public QObject
 
 public:
 	// global instance pointer
-	static HyperionIManager* getInstance() { return HIMinstance; };
+	static HyperionIManager* getInstance() { return HIMinstance; }
 	static HyperionIManager* HIMinstance;
 
 public slots:
@@ -38,7 +38,7 @@ public slots:
 	/// @param inst  The instance to check
 	/// @return  True when running else false
 	///
-	bool IsInstanceRunning(const quint8& inst) { return _runningInstances.contains(inst); };
+	bool IsInstanceRunning(const quint8& inst) { return _runningInstances.contains(inst); }
 
 	///
 	/// @brief Get a Hyperion instance by index
@@ -103,7 +103,7 @@ public slots:
 	/// @param instance      The index of instance
 	/// @param name          The name of the instance, just available with H_CREATED
 	///
-	void instanceStateChanged(const instanceState& state, const quint8& instance, const QString& name = QString());
+	void instanceStateChanged(const InstanceState& state, const quint8& instance, const QString& name = QString());
 
 	///
 	/// @brief Emits whenever something changes, the lazy version of instanceStateChanged (- H_ON_STOP) + saveName() emit
@@ -172,7 +172,7 @@ private slots:
 	/// @brief check if a instance is allowed for management. Instance 0 represents the root instance
 	/// @apram inst The instance to check
 	///
-	bool isInstAllowed(const quint8& inst) { return (inst > 0); };
+	bool isInstAllowed(const quint8& inst) { return (inst > 0); }
 
 private:
 	Logger* _log;

diff --git a/include/hyperion/LedString.h b/include/hyperion/LedString.h
@@ -40,6 +40,7 @@ inline QString colorOrderToString(const ColorOrder colorOrder)
 		return "not-a-colororder";
 	}
 }
+
 inline ColorOrder stringToColorOrder(const QString & order)
 {
 	if (order == "rgb")

diff --git a/include/leddevice/LedDevice.h b/include/leddevice/LedDevice.h
@@ -36,7 +36,7 @@ class LedDevice : public QObject
 
 public:
 	LedDevice(const QJsonObject& config = QJsonObject(), QObject* parent = nullptr);
-	virtual ~LedDevice();
+	~LedDevice() override;
 
 	///
 	/// @brief Get color order of device
@@ -92,7 +92,7 @@ public slots:
 	///
 	/// Is called on thread start, all construction tasks and init should run here
 	///
-	virtual void start() { _deviceReady = (open() == 0 ? true : false);}
+	virtual void start() { _deviceReady = (open() == 0); }
 
 	///
 	/// Update the RGB-Color values to the leds.
@@ -186,7 +186,6 @@ public slots:
 	/// Time a device requires mandatorily between two writes
 	int	_latchTime_ms;
 
-
 protected slots:
 
 	/// Write the last data to the leds again

diff --git a/include/leddevice/LedDeviceWrapper.h b/include/leddevice/LedDeviceWrapper.h
@@ -19,7 +19,7 @@ class LedDeviceWrapper : public QObject
 	Q_OBJECT
 public:
 	explicit LedDeviceWrapper(Hyperion* hyperion);
-	~LedDeviceWrapper();
+	~LedDeviceWrapper() override;
 	///
 	/// @brief Contructs a new LedDevice, moves to thread and starts
 	/// @param config  With the given config
@@ -106,7 +106,7 @@ private slots:
 private:
 	///
 	/// @brief switchOff() the device and Stops the device thread
-	/// 
+	///
 	void stopDeviceThread();
 
 private:

diff --git a/include/protoserver/ProtoServer.h b/include/protoserver/ProtoServer.h
@@ -22,7 +22,7 @@ class ProtoServer : public QObject
 
 public:
 	ProtoServer(const QJsonDocument& config, QObject* parent = nullptr);
-	~ProtoServer();
+	~ProtoServer() override;
 
 public slots:
 	///