Start SmartPointers

CHANGELOG.md

@@ -53,6 +53,7 @@ Note: The wizard will configure an APIv2 capable bridge always with Entertainmen
 - MDNSBrower - Fixed, if timeout while resolving host occurs
 - Non image updates ignored blacklisted LEDs (#1634)
 - Fixed that Windows OsEvents failed in non-GUI mode (#1671)
+- Addressed serious (#1425) and some smaller memory leaks
 
 ##### LED-Devices
 
@@ -79,6 +80,7 @@ Note: The wizard will configure an APIv2 capable bridge always with Entertainmen
 - Changed default build from Stretch to Buster
 - Support Qt 6.7, Update to Protobuf 25.1, Update mbedTLS to v3.4.0, Update flatbuffers to v23.5.26
 - Use C++17 standard as default
+- Started using SmartPointers (#981)
 - Added Pull Request (PR) installation script, allowing users to test development builds savely on Linux
 - Fixed missing include limits in QJsonSchemaChecker - Thanks @Portisch
 - Fixed dependencies for deb packages in Debian Bookworm (#1579) - Thanks @hg42, @Psirus

include/blackborder/BlackBorderProcessor.h

@@ -1,4 +1,7 @@
-#pragma once
+#ifndef BLACK_BORDER_PROCESSOR_H
+#define BLACK_BORDER_PROCESSOR_H
+
+#include <memory>
 
 // QT includes
 #include <QJsonObject>
@@ -24,7 +27,7 @@ namespace hyperion
 		Q_OBJECT
 	public:
 		BlackBorderProcessor(Hyperion* hyperion, QObject* parent);
-		~BlackBorderProcessor() override;
+
 		///
 		/// Return the current (detected) border
 		/// @return The current border
@@ -141,7 +144,7 @@ namespace hyperion
 		QString _detectionMode;
 
 		/// The black-border detector
-		BlackBorderDetector* _detector;
+		std::unique_ptr<BlackBorderDetector> _detector;
 
 		/// The current detected border
 		BlackBorder _currentBorder;
@@ -162,3 +165,5 @@ namespace hyperion
 
 	};
 } // end namespace hyperion
+
+#endif // BLACK_BORDER_PROCESSOR_H

include/events/EventHandler.h

@@ -13,10 +13,9 @@ class EventHandler : public QObject
 	Q_OBJECT
 
 public:
-	EventHandler();
 	~EventHandler() override;
 
-	static EventHandler* getInstance();
+	static QScopedPointer<EventHandler>& getInstance();
 
 public slots:
 
@@ -40,6 +39,12 @@ public slots:
 	Logger * _log {};
 
 private:
+	EventHandler();
+	EventHandler(const EventHandler&) = delete;
+	EventHandler& operator=(const EventHandler&) = delete;
+
+	static QScopedPointer<EventHandler> instance;
+
 	bool _isSuspended;
 	bool _isIdle;
 };

include/grabber/amlogic/AmlogicWrapper.h

@@ -12,6 +12,9 @@ class AmlogicWrapper : public GrabberWrapper
 {
 	Q_OBJECT
 public:
+
+	static constexpr const char* GRABBERTYPE = "Amlogic";
+
 	///
 	/// Constructs the Amlogic frame grabber
 	///
@@ -22,6 +25,12 @@ class AmlogicWrapper : public GrabberWrapper
 	AmlogicWrapper(int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
 					int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ);
 
+	///
+	/// Constructs the Amlogic frame grabber from configuration settings
+	///
+	AmlogicWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
+
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

include/grabber/directx/DirectXWrapper.h

@@ -6,6 +6,8 @@
 class DirectXWrapper: public GrabberWrapper
 {
 public:
+	static constexpr const char* GRABBERTYPE = "DirectX";
+
 	///
 	/// Constructs the DirectX grabber with a specified grab size and update rate.
 	///
@@ -25,6 +27,11 @@ class DirectXWrapper: public GrabberWrapper
 					int cropTop=0, int cropBottom=0
 					);
 
+	///
+	/// Constructs the QT frame grabber from configuration settings
+	///
+	DirectXWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
 	///
 	/// Destructor of this DirectX grabber. Releases any claimed resources.
 	///

include/grabber/dispmanx/DispmanxFrameGrabber.h

@@ -36,9 +36,9 @@ class DispmanxFrameGrabber : public Grabber
 	///
 	/// @brief Determine if the bcm library is available.
 	///
-	/// @return Zero, on success (i.e. library is present), else negative
+	/// @return true, on success (i.e. library is present), else false
 	///
-	bool isAvailable();
+	bool isAvailable() override;
 
 	///
 	/// @brief Opens the input device.

include/grabber/dispmanx/DispmanxWrapper.h

@@ -13,6 +13,9 @@ class DispmanxWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
+
+	static constexpr const char* GRABBERTYPE = "DispmanX";
+
 	///
 	/// Constructs the dispmanx frame grabber with a specified grab size and update rate.
 	///
@@ -23,9 +26,12 @@ class DispmanxWrapper: public GrabberWrapper
 					 int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
 					 );
 
-	bool screenInit();
+	///
+	/// Constructs the QT frame grabber from configuration settings
+	///
+	DispmanxWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
 
-	bool available = false;
+	bool screenInit();
 
 	///
 	/// Starts the grabber which produces led values with the specified update rate

include/grabber/framebuffer/FramebufferFrameGrabber.h

@@ -17,7 +17,7 @@ class FramebufferFrameGrabber : public Grabber
 	///
 	/// @param[in] device The framebuffer device name/path
 	///
-	FramebufferFrameGrabber(const QString & device="/dev/fb0");
+	FramebufferFrameGrabber(int deviceIdx = 0);
 
 	~FramebufferFrameGrabber() override;
 
@@ -45,7 +45,7 @@ class FramebufferFrameGrabber : public Grabber
 	///@brief Set new width and height for framegrabber, overwrite Grabber.h implementation
 	bool setWidthHeight(int width, int height) override;
 
-	QString getPath() const {return _fbDevice;}
+	QString getPath() const {return QString("/dev/fb%1").arg(_input);}
 
 	///
 	/// @brief Discover Framebuffer screens available (for configuration).
@@ -62,7 +62,7 @@ class FramebufferFrameGrabber : public Grabber
 	bool closeDevice();
 	bool getScreenInfo();
 
-	/// Framebuffer device e.g. /dev/fb0
+	// /// Framebuffer device e.g. /dev/fb0
 	QString _fbDevice;
 
 	int _fbfd;

include/grabber/framebuffer/FramebufferWrapper.h

@@ -12,18 +12,26 @@ class FramebufferWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
+
+	static constexpr const char* GRABBERTYPE = "FB";
+
 	///
 	/// Constructs the framebuffer frame grabber with a specified grab size and update rate.
 	///
 	/// @param[in] updateRate_Hz  The image grab rate [Hz]
-	/// @param[in] device Framebuffer device name/path
+	/// @param[in] deviceIdx Framebuffer device index
 	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	///
 	FramebufferWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
-						const QString & device = "/dev/fb0",
+						int deviceIdx = 0,
 						int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
 						);
 
+	///
+	/// Constructs the QT frame grabber from configuration settings
+	///
+	FramebufferWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

include/grabber/osx/OsxWrapper.h

@@ -11,6 +11,8 @@ class OsxWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
+
+	static constexpr const char* GRABBERTYPE = "OSX";
 	///
 	/// Constructs the osx frame grabber with a specified grab size and update rate.
 	///
@@ -23,6 +25,12 @@ class OsxWrapper: public GrabberWrapper
 				int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
 				);
 
+	///
+	/// Constructs the QT frame grabber from configuration settings
+	///
+	OsxWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
+
 public slots:
 	///
 	/// Performs a single frame grab and computes the led-colors

include/grabber/qt/QtGrabber.h

@@ -113,8 +113,8 @@ private slots:
 	int _display;
 	int _numberOfSDisplays;
 
-	int _calculatedWidth;
-	int _calculatedHeight;
+	int _screenWidth;
+	int _screenHeight;
 	int _src_x;
 	int _src_y;
 	int _src_x_max;

include/grabber/qt/QtWrapper.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QJsonObject>
+#include <QStringLiteral>
+
 #include <hyperion/GrabberWrapper.h>
 #include <grabber/qt/QtGrabber.h>
 
@@ -8,7 +11,10 @@
 ///
 class QtWrapper: public GrabberWrapper
 {
+
 public:
+	static constexpr const char* GRABBERTYPE = "Qt";
+
 	///
 	/// Constructs the QT frame grabber with a specified grab size and update rate.
 	///
@@ -19,7 +25,6 @@ class QtWrapper: public GrabberWrapper
 	/// @param[in] cropRight 	     Remove from right [pixels]
 	/// @param[in] cropTop           Remove from top [pixels]
 	/// @param[in] cropBottom        Remove from bottom [pixels]
-
 	///
 	QtWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
 			   int display=0,
@@ -28,6 +33,11 @@ class QtWrapper: public GrabberWrapper
 			   int cropTop=0, int cropBottom=0
 			   );
 
+	///
+	/// Constructs the QT frame grabber from configuration settings
+	///
+	QtWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
 	///
 	/// Starts the grabber which produces led values with the specified update rate
 	///

include/grabber/x11/X11Grabber.h

@@ -57,7 +57,7 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
 	///
 	/// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions
 	///
-	bool setWidthHeight(int width, int height) override { return true; }
+	bool setWidthHeight(int /*width*/, int /*height*/) override { return true; }
 
 	///
 	/// @brief Apply new pixelDecimation
@@ -109,19 +109,19 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
 	Picture _srcPicture;
 	Picture _dstPicture;
 
-	int _XRandREventBase;
+	int _xRandREventBase;
 
 	XTransform _transform;
 
-	unsigned _calculatedWidth;
-	unsigned _calculatedHeight;
-	unsigned _src_x;
-	unsigned _src_y;
+	int _screenWidth;
+	int _screenHeight;
+	int _src_x;
+	int _src_y;
 
-	bool _XShmAvailable;
-	bool _XShmPixmapAvailable;
-	bool _XRenderAvailable;
-	bool _XRandRAvailable;
+	bool _xShmAvailable;
+	bool _xShmPixmapAvailable;
+	bool _xRenderAvailable;
+	bool _xRandRAvailable;
 	bool _isWayland;
 
 	Logger * _logger;

include/grabber/x11/X11Wrapper.h

@@ -7,14 +7,15 @@
 	#undef None
 #endif
 
-
 ///
 /// The X11Wrapper uses an instance of the X11Grabber to obtain ImageRgb's from the displayed content.
 /// This ImageRgb is processed to a ColorRgb for each led and committed to the attached Hyperion.
 ///
 class X11Wrapper: public GrabberWrapper
 {
 public:
+	static constexpr const char* GRABBERTYPE = "X11";
+
 	///
 	/// Constructs the X11 frame grabber with a specified grab size and update rate.
 	///
@@ -27,6 +28,11 @@ class X11Wrapper: public GrabberWrapper
 				int cropTop=0, int cropBottom=0
 				);
 
+	///
+	/// Constructs the X11 frame grabber from configuration settings
+	///
+	X11Wrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
 	///
 	/// Destructor of this frame grabber. Releases any claimed resources.
 	///

include/grabber/xcb/XcbWrapper.h

@@ -11,12 +11,30 @@
 class XcbWrapper: public GrabberWrapper
 {
 public:
+
+	static constexpr const char* GRABBERTYPE = "XCB";
+
+	///
+	/// Constructs the XCB frame grabber with a specified grab size and update rate.
+	///
+	/// @param[in] updateRate_Hz     The image grab rate [Hz]
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
+	/// @param[in] cropLeft          Remove from left [pixels]
+	/// @param[in] cropRight 	     Remove from right [pixels]
+	/// @param[in] cropTop           Remove from top [pixels]
+	/// @param[in] cropBottom        Remove from bottom [pixels]
+	///
 	XcbWrapper(	int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
 				int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
 				int cropLeft=0, int cropRight=0,
 				int cropTop=0, int cropBottom=0
 				);
 
+	///
+	/// Constructs the XCB frame grabber from configuration settings
+	///
+	XcbWrapper(const QJsonDocument& grabberConfig = QJsonDocument());
+
 	~XcbWrapper() override;
 
 public slots:

include/hyperion/BGEffectHandler.h

@@ -43,6 +43,16 @@ class BGEffectHandler : public QObject
 		handleSettingsUpdate(settings::BGEFFECT, _hyperion->getSetting(settings::BGEFFECT));
 	}
 
+	///
+	/// @brief Disconnect from connected signals
+	/// Disconnect should be done before other priorities invoke methods during shutdown
+	///
+	void disconnect()
+	{
+		QObject::disconnect(_prioMuxer, &PriorityMuxer::prioritiesChanged, nullptr, nullptr);
+		QObject::disconnect(_hyperion, nullptr, nullptr, nullptr);
+	}
+
 	///
 	/// @brief Check, if background effect processing is enabled.
 	/// @return True, background effect processing is enabled.