Have CECEvent to actions configurable, further clean-ups

include/cec/CECHandler.h

@@ -2,14 +2,13 @@
 
 #include <QObject>
 #include <QVector>
+#include <QMap>
 
 #include <iostream>
 
 #include <libcec/cec.h>
 
 #include <utils/settings.h>
-
-//#include <cec/CECEvent.h>
 #include <events/Event.h>
 
 using CECCallbacks         = CEC::ICECCallbacks;
@@ -33,23 +32,28 @@ class CECHandler : public QObject
 {
 	Q_OBJECT
 public:
-	CECHandler();
+	CECHandler(const QJsonDocument& config, QObject * parent = nullptr);
 	~CECHandler() override;
 
 	QString scan() const;
 
 public slots:
+
 	bool start();
 	void stop();
 
 	virtual void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
 
-signals:
-	//void cecEvent(CECEvent event);
+private:
 
+signals:
 	void signalEvent(Event event);
 
 private:
+
+	bool enable();
+	void disable();
+
 	/* CEC Callbacks */
 	static void onCecLogMessage           (void * context, const CECLogMessage * message);
 	static void onCecKeyPress             (void * context, const CECKeyPress * key);
@@ -64,6 +68,11 @@ private:
 	bool openAdapter(const CECAdapterDescriptor & descriptor);
 	void printAdapter(const CECAdapterDescriptor & descriptor) const;
 
+	// CEC Event Strings per https://github.com/Pulse-Eight/libcec/blob/master/src/libcec/CECTypeUtils.h
+	void triggerAction(const QString& cecEvent);
+
+	QJsonDocument _config;
+
 	/* CEC Helpers */
 	CECCallbacks getCallbacks() const;
 	CECConfig getConfig() const;
@@ -72,7 +81,14 @@ private:
 	CECCallbacks _cecCallbacks {};
 	CECConfig    _cecConfig    {};
 
+	bool _isInitialised;
 	bool _isEnabled;
 
+	int _buttonReleaseDelayMs;
+	int _buttonRepeatRateMs;
+	int _doubleTapTimeoutMs;
+
+	QMap<QString,Event> _cecEventActionMap;
+
 	Logger * _logger {};
 };