Refactor event handling incl.CEC

include/api/JsonAPI.h

@@ -2,6 +2,7 @@
 
 // parent class
 #include <api/API.h>
+#include <events/Event.h>
 
 // hyperion includes
 #include <utils/Components.h>
@@ -105,24 +106,9 @@ signals:
 	void forwardJsonMessage(QJsonObject);
 
 	///
-	/// Signal emits whenever a suspend/resume request for all instances should be forwarded
+	/// Signal emits whenever a hyperion event request for all instances should be forwarded
 	///
-	void suspendAll(bool isSuspend);
-
-	///
-	/// Signal emits whenever a toggle suspend/resume request for all instances should be forwarded
-	///
-	void toggleSuspendAll();
-
-	///
-	/// Signal emits whenever a idle mode request for all instances should be forwarded
-	///
-	void idleAll(bool isIdle);
-
-	///
-	/// Signal emits whenever a toggle idle/working mode request for all instances should be forwarded
-	///
-	void toggleIdleAll();
+	void signalEvent(Event event);
 
 private:
 	// true if further callbacks are forbidden (http)

include/cec/CECEvent.h

@@ -1,8 +0,0 @@
-#pragma once
-
-enum class CECEvent
-{
-        On,
-        Off
-};
-

include/cec/CECHandler.h

@@ -7,7 +7,10 @@
 
 #include <libcec/cec.h>
 
-#include <cec/CECEvent.h>
+#include <utils/settings.h>
+
+//#include <cec/CECEvent.h>
+#include <events/Event.h>
 
 using CECCallbacks         = CEC::ICECCallbacks;
 using CECAdapter           = CEC::ICECAdapter;
@@ -39,8 +42,12 @@ public slots:
 	bool start();
 	void stop();
 
+	virtual void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
+
 signals:
-	void cecEvent(CECEvent event);
+	//void cecEvent(CECEvent event);
+
+	void signalEvent(Event event);
 
 private:
 	/* CEC Callbacks */
@@ -65,5 +72,7 @@ private:
 	CECCallbacks _cecCallbacks {};
 	CECConfig    _cecConfig    {};
 
+	bool _isEnabled;
+
 	Logger * _logger {};
 };

include/db/SettingsTable.h

@@ -113,7 +113,7 @@ public:
 		// capture
 		<< "framegrabber" << "grabberV4L2" << "grabberAudio"
 		//Events
-		<< "systemEvents"
+		 << "osEvents" << "cecEvents"
 		// other
 		<< "logger" << "general";
 

include/events/Event.h

@@ -0,0 +1,32 @@
+#ifndef EVENT_H
+#define EVENT_H
+
+enum class Event
+{
+	Suspend,
+	Resume,
+	ToggleSuspend,
+	Idle,
+	ResumeIdle,
+	ToggleIdle,
+	Reload,
+	Restart
+};
+
+inline const char* eventToString(Event event)
+{
+	switch (event)
+	{
+	case Event::Suspend:       return "Suspend";
+	case Event::Resume:        return "Resume";
+	case Event::ToggleSuspend: return "ToggleSuspend detector";
+	case Event::Idle:          return "Idle";
+	case Event::ResumeIdle:    return "ResumeIdle";
+	case Event::ToggleIdle:    return "ToggleIdle";
+	case Event::Reload:        return "Reload";
+	case Event::Restart:       return "Restart";
+	default:                   return "Unknown";
+	}
+}
+
+#endif // EVENT_H

include/events/EventHandler.h

@@ -0,0 +1,54 @@
+#ifndef EVENTHANDLER_H
+#define EVENTHANDLER_H
+
+#include <utils/settings.h>
+#include <events/Event.h>
+
+#include <QObject>
+
+class Logger;
+
+class EventHandler : public QObject {
+	Q_OBJECT
+
+public:
+
+	EventHandler();
+	~EventHandler() override;
+
+	static EventHandler* getInstance();
+
+public slots:
+
+	virtual void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
+
+	void suspend(bool sleep);
+
+	void suspend();
+	void resume();
+	void toggleSuspend();
+
+	void idle(bool isIdle);
+	void idle();
+	void resumeIdle();
+	void toggleIdle();
+
+	void handleEvent(Event event);
+
+signals:
+
+	void signalEvent(Event event);
+
+protected:
+
+	Logger * _log {};
+
+private:
+
+	bool _isSuspended;
+	bool _isIdle;
+};
+
+
+#endif // EVENTHANDLER_H
+

include/events/OsEventHandler.h

@@ -0,0 +1,116 @@
+#ifndef OsEventHandler_H
+#define OsEventHandler_H
+#include <QObject>
+#include <QJsonDocument>
+
+#include <events/Event.h>
+
+#if defined(_WIN32)
+#include <QAbstractNativeEventFilter>
+#include <QAbstractEventDispatcher>
+#include <QWidget>
+#include <windows.h>
+#endif
+
+#include <utils/settings.h>
+
+class Logger;
+
+class OsEventHandlerBase : public QObject {
+	Q_OBJECT
+
+public:
+	OsEventHandlerBase();
+	~OsEventHandlerBase() override;
+
+public slots:
+
+	void suspend(bool sleep);
+	void lock(bool isLocked);
+
+	virtual void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
+
+signals:
+
+	void signalEvent(Event event);
+
+protected:
+
+	virtual bool registerOsEventHandler() { return true; }
+	virtual void unregisterOsEventHandler() {}
+	virtual bool registerLockHandler() { return true; }
+	virtual void unregisterLockHandler() {}
+
+	bool _isSuspendEnabled;
+	bool _isLockEnabled;
+	bool _isSuspendOnLock;
+
+	bool _isSuspendRegistered;
+	bool _isLockRegistered;
+
+	Logger * _log {};
+
+private:
+
+};
+
+#if defined(_WIN32)
+
+class OsEventHandlerWindows : public OsEventHandlerBase, public QAbstractNativeEventFilter {
+
+public:
+	OsEventHandlerWindows();
+	~OsEventHandlerWindows() override;
+
+protected:
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+	bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
+#else
+	bool nativeEventFilter(const QByteArray& eventType, void* message, long int* result) override;
+#endif
+^
+private:
+
+	bool registerOsEventHandler() override;
+	void unregisterOsEventHandler() override;
+	bool registerLockHandler() override;
+	void unregisterLockHandler() override;
+
+	QWidget			_widget;
+	HPOWERNOTIFY	_notifyHandle;
+};
+
+using OsEventHandler = OsEventHandlerWindows;
+
+#elif defined(__linux__)
+class OsEventHandlerLinux : public OsEventHandlerBase {
+	Q_OBJECT
+
+	static void static_signaleHandler(int signum)
+	{
+		OsEventHandlerLinux::getInstance()->handleSignal(signum);
+	}
+
+public:
+	OsEventHandlerLinux();
+
+	void handleSignal (int signum);
+
+private:
+	static OsEventHandlerLinux* getInstance();
+
+#if defined(HYPERION_HAS_DBUS)
+	bool registerOsEventHandler() override;
+	void unregisterOsEventHandler() override;
+	bool registerLockHandler() override;
+	void unregisterLockHandler() override;
+#endif
+};
+
+using OsEventHandler = OsEventHandlerLinux;
+
+#else
+using OsEventHandler = OsEventHandlerBase;
+#endif
+
+#endif // OsEventHandler_H

include/grabber/V4L2Grabber.h

@@ -24,9 +24,7 @@
 // Determine the cmake options
 #include <HyperionConfig.h>
 
-#if defined(ENABLE_CEC)
-	#include <cec/CECEvent.h>
-#endif
+#include <events/Event.h>
 
 ///
 /// Capture class for V4L2 devices
@@ -77,13 +75,10 @@ public:
 	void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold, int noSignalCounterThreshold = 50);
 	void setSignalDetectionOffset( double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
 	void setSignalDetectionEnable(bool enable);
-	void setCecDetectionEnable(bool enable);
 	bool reload(bool force = false);
 
 	QRectF getSignalDetectionOffset() const { return QRectF(_x_frac_min, _y_frac_min, _x_frac_max, _y_frac_max); } //used from hyperion-v4l2
 
-
-
 	///
 	/// @brief Discover available V4L2 USB devices (for configuration).
 	/// @param[in] params Parameters used to overwrite discovery default behaviour
@@ -97,9 +92,7 @@ public slots:
 	void stop();
 	void newThreadFrame(Image<ColorRgb> image);
 
-#if defined(ENABLE_CEC)
-	void handleCecEvent(CECEvent event);
-#endif
+	void handleEvent(Event event);
 
 signals:
 	void newFrame(const Image<ColorRgb> & image);
@@ -167,7 +160,7 @@ private:
 	// signal detection
 	int      _noSignalCounterThreshold;
 	ColorRgb _noSignalThresholdColor;
-	bool     _cecDetectionEnabled, _cecStandbyActivated, _signalDetectionEnabled, _noSignalDetected;
+	bool     _standbyActivated, _signalDetectionEnabled, _noSignalDetected;
 	int      _noSignalCounter;
 	int		_brightness, _contrast, _saturation, _hue;
 	double   _x_frac_min;

include/grabber/VideoWrapper.h

@@ -9,9 +9,7 @@
 	#include <grabber/V4L2Grabber.h>
 #endif
 
-#if defined(ENABLE_CEC)
-	#include <cec/CECEvent.h>
-#endif
+#include <events/Event.h>
 
 class VideoWrapper : public GrabberWrapper
 {
@@ -25,9 +23,7 @@ public slots:
 	bool start() override;
 	void stop() override;
 
-#if defined(ENABLE_CEC)
-	void handleCecEvent(CECEvent event);
-#endif
+	void handleEvent(Event event);
 
 	void handleSettingsUpdate(settings::type type, const QJsonDocument& config) override;
 

include/hyperion/HyperionIManager.h

@@ -5,6 +5,7 @@
 #include <utils/VideoMode.h>
 #include <utils/settings.h>
 #include <utils/Components.h>
+#include <events/Event.h>
 
 // qt
 #include <QMap>
@@ -74,26 +75,10 @@ public slots:
 	bool stopInstance(quint8 inst);
 
 	///
-	/// @brief Suspend (disable) all Hyperion instances
+	/// @brief Handle an Hyperion Event
+	/// @param event Event to be processed
 	///
-	void suspend();
-
-	///
-	/// @brief Resume (resume) all Hyperion instances
-	///
-	void resume();
-
-	///
-	/// @brief Toggle the state of all Hyperion instances for a suspend sceanrio (user is not interacting with the system)
-	/// @param isSuspend, If true all instances toggle to suspend, else to resume
-	///
-	void toggleSuspend(bool isSuspend);
-
-	///
-	/// @brief Toggle the state of all Hyperion instances for an idle sceanrio
-	/// @param isIdle, If true all instances toggle to idle, else to resume
-	///
-	void toggleIdle(bool isIdle);
+	void handleEvent(Event event);
 
 	///
 	/// @brief Toggle the state of all Hyperion instances
@@ -147,10 +132,6 @@ signals:
 	///
 	void startInstanceResponse(QObject *caller, const int &tan);
 
-	void triggerSuspend(bool isSuspend);
-	void triggerToggleSuspend();
-	void triggerIdle(bool isIdle);
-	void triggerToggleIdle();
 
 signals:
 	///////////////////////////////////////
@@ -192,6 +173,18 @@ private slots:
 	///
 	void handleFinished();
 
+	///
+	/// @brief Toggle the state of all Hyperion instances for a suspend sceanrio (user is not interacting with the system)
+	/// @param isSuspend, If true all instances toggle to suspend, else to resume
+	///
+	void toggleSuspend(bool isSuspend);
+
+	///
+	/// @brief Toggle the state of all Hyperion instances for an idle sceanrio
+	/// @param isIdle, If true all instances toggle to idle, else to resume
+	///
+	void toggleIdle(bool isIdle);
+
 private:
 	friend class HyperionDaemon;
 	///

include/utils/settings.h

@@ -30,7 +30,8 @@ namespace settings {
 		NETWORK,
 		FLATBUFSERVER,
 		PROTOSERVER,
-		SYSTEMEVENTS,
+		OSEVENTS,
+		CECEVENTS,
 		INVALID
 	};
 
@@ -65,7 +66,8 @@ namespace settings {
 		case NETWORK:       return "network";
 		case FLATBUFSERVER: return "flatbufServer";
 		case PROTOSERVER:   return "protoServer";
-		case SYSTEMEVENTS:  return "systemEvents";
+		case OSEVENTS:      return "osEvents";
+		case CECEVENTS:     return "cecEvents";
 		default:            return "invalid";
 		}
 	}
@@ -99,7 +101,8 @@ namespace settings {
 		else if (type == "network")              return NETWORK;
 		else if (type == "flatbufServer")        return FLATBUFSERVER;
 		else if (type == "protoServer")          return PROTOSERVER;
-		else if (type == "systemEvents")         return SYSTEMEVENTS;
+		else if (type == "osEvents")             return OSEVENTS;
+		else if (type == "cecEvents")            return CECEVENTS;
 		else                                     return INVALID;
 	}
 }