enable components at runtime + grabber refactoring (hyperion-project#160)

* implement enable/disable on runtime for:
- smoothing
- kodi
- udplistener
- boblight

* implement enable/disable for forwarder
refactor component

* - implement grabber enable/disable at runtime
- big grabber refactoring. now with common base class for all grabbers

* implement enable/disable at runtime for bb detector

* osx fix

* try to fix cutted travis output for osx build

Author: redPanther

.travis/travis_build.sh

@@ -10,8 +10,8 @@
 # compile hyperion on osx
 if [[ $TRAVIS_OS_NAME == 'osx' ]]
 then
-    procs=$(sysctl -n hw.ncpu | xargs)
-    echo "Processes: $procs"
+	procs=$(sysctl -n hw.ncpu | xargs)
+	echo "Processes: $procs"
 
 	mkdir build || exit 1
     cd build

PULL_REQUEST_TEMPLATE

@@ -3,7 +3,7 @@
 
 **2.** If this changes affect the .conf file. Please provide the changed section
 
-**3.** Reference a issue (optional)
+**3.** Reference an issue (optional)
 
 Note: For further discussions use our forum: forum.hyperion-project.org
 

include/boblightserver/BoblightServer.h

@@ -10,6 +10,7 @@
 // Hyperion includes
 #include <hyperion/Hyperion.h>
 #include <utils/Logger.h>
+#include <utils/Components.h>
 
 class BoblightClientConnection;
 
@@ -37,7 +38,8 @@ class BoblightServer : public QObject
 	/// @return true if server is active (bind to a port)
 	///
 	bool active() { return _isActive; };
-	
+	bool componentState() { return active(); };
+
 public slots:
 	///
 	/// bind server to network
@@ -49,6 +51,8 @@ public slots:
 	///
 	void stop();
 
+	void componentStateChanged(const hyperion::Components component, bool enable);
+
 signals:
 	void statusChanged(bool isActive);
 

include/grabber/AmlogicWrapper.h

@@ -1,15 +1,12 @@
 #pragma once
 
-// QT includes
-#include <QObject>
-#include <QTimer>
-
 // Utils includes
 #include <utils/Image.h>
 #include <utils/ColorBgr.h>
 #include <utils/ColorRgb.h>
 #include <utils/GrabbingMode.h>
 #include <utils/VideoMode.h>
+#include <hyperion/GrabberWrapper.h>
 
 // Forward class declaration
 class AmlogicGrabber;
@@ -21,7 +18,7 @@ class ImageProcessor;
 /// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
 /// attached Hyperion.
 ///
-class AmlogicWrapper : public QObject
+class AmlogicWrapper : public GrabberWrapper
 {
 	Q_OBJECT
 public:
@@ -41,20 +38,10 @@ class AmlogicWrapper : public QObject
 	virtual ~AmlogicWrapper();
 
 public slots:
-	///
-	/// Starts the grabber wich produces led values with the specified update rate
-	///
-	void start();
-
 	///
 	/// Performs a single frame grab and computes the led-colors
 	///
-	void action();
-
-	///
-	/// Stops the grabber
-	///
-	void stop();
+	virtual void action();
 
 	///
 	/// Set the grabbing mode
@@ -68,33 +55,17 @@ public slots:
 	///
 	void setVideoMode(const VideoMode videoMode);
 
-signals:
-	void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
-
 private:
 	/// The update rate [Hz]
 	const int _updateInterval_ms;
 	/// The timeout of the led colors [ms]
 	const int _timeout_ms;
-	/// The priority of the led colors
-	const int _priority;
-
-	/// The timer for generating events with the specified update rate
-	QTimer _timer;
 
 	/// The image used for grabbing frames
 	Image<ColorBgr> _image;
 	/// The actual grabber
-	AmlogicGrabber * _frameGrabber;
-	/// The processor for transforming images to led colors
-	ImageProcessor * _processor;
+	AmlogicGrabber * _grabber;
 
 	/// The list with computed led colors
 	std::vector<ColorRgb> _ledColors;
-
-	/// Pointer to Hyperion for writing led values
-	Hyperion * _hyperion;
-
-	// forwarding enabled
-	bool _forward;
 };

include/grabber/DispmanxWrapper.h

@@ -1,27 +1,23 @@
 #pragma once
 
-// QT includes
-#include <QObject>
-#include <QTimer>
-
 // Utils includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
 #include <utils/ColorRgba.h>
 #include <utils/GrabbingMode.h>
 #include <utils/VideoMode.h>
+#include <hyperion/GrabberWrapper.h>
 
 // Forward class declaration
 class DispmanxFrameGrabber;
-class Hyperion;
 class ImageProcessor;
 
 ///
 /// The DispmanxWrapper uses an instance of the DispmanxFrameGrabber to obtain ImageRgb's from the
 /// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
 /// attached Hyperion.
 ///
-class DispmanxWrapper: public QObject
+class DispmanxWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
@@ -41,20 +37,10 @@ class DispmanxWrapper: public QObject
 	virtual ~DispmanxWrapper();
 
 public slots:
-	///
-	/// Starts the grabber wich produces led values with the specified update rate
-	///
-	void start();
-
 	///
 	/// Performs a single frame grab and computes the led-colors
 	///
-	void action();
-
-	///
-	/// Stops the grabber
-	///
-	void stop();
+	virtual void action();
 
 	void setCropping(const unsigned cropLeft, const unsigned cropRight,
 		const unsigned cropTop, const unsigned cropBottom);
@@ -71,9 +57,6 @@ public slots:
 	///
 	void setVideoMode(const VideoMode videoMode);
 
-signals:
-	void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
-
 private:
 	/// The update rate [Hz]
 	const int _updateInterval_ms;
@@ -82,22 +65,11 @@ public slots:
 	/// The priority of the led colors
 	const int _priority;
 
-	/// The timer for generating events with the specified update rate
-	QTimer _timer;
-
 	/// The image used for grabbing frames
 	Image<ColorRgba> _image;
 	/// The actual grabber
-	DispmanxFrameGrabber * _frameGrabber;
-	/// The processor for transforming images to led colors
-	ImageProcessor * _processor;
+	DispmanxFrameGrabber * _grabber;
 
 	/// The list with computed led colors
 	std::vector<ColorRgb> _ledColors;
-
-	/// Pointer to Hyperion for writing led values
-	Hyperion * _hyperion;
-
-	// forwarding enabled
-	bool _forward;
 };

include/grabber/FramebufferWrapper.h

@@ -1,26 +1,22 @@
 #pragma once
 
-// QT includes
-#include <QObject>
-#include <QTimer>
-
 // Utils includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
 #include <utils/GrabbingMode.h>
 #include <utils/VideoMode.h>
+#include <hyperion/GrabberWrapper.h>
 
 // Forward class declaration
 class FramebufferFrameGrabber;
-class Hyperion;
 class ImageProcessor;
 
 ///
 /// The FramebufferWrapper uses an instance of the FramebufferFrameGrabber to obtain ImageRgb's from the
 /// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
 /// attached Hyperion.
 ///
-class FramebufferWrapper: public QObject
+class FramebufferWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
@@ -40,20 +36,10 @@ class FramebufferWrapper: public QObject
 	virtual ~FramebufferWrapper();
 
 public slots:
-	///
-	/// Starts the grabber wich produces led values with the specified update rate
-	///
-	void start();
-
 	///
 	/// Performs a single frame grab and computes the led-colors
 	///
-	void action();
-
-	///
-	/// Stops the grabber
-	///
-	void stop();
+	virtual void action();
 
 	///
 	/// Set the grabbing mode
@@ -67,30 +53,17 @@ public slots:
 	///
 	void setVideoMode(const VideoMode videoMode);
 
-signals:
-	void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
-
 private:
 	/// The update rate [Hz]
 	const int _updateInterval_ms;
 	/// The timeout of the led colors [ms]
 	const int _timeout_ms;
-	/// The priority of the led colors
-	const int _priority;
-
-	/// The timer for generating events with the specified update rate
-	QTimer _timer;
 
 	/// The image used for grabbing frames
 	Image<ColorRgb> _image;
 	/// The actual grabber
-	FramebufferFrameGrabber * _frameGrabber;
-	/// The processor for transforming images to led colors
-	ImageProcessor * _processor;
+	FramebufferFrameGrabber * _grabber;
 
 	/// The list with computed led colors
 	std::vector<ColorRgb> _ledColors;
-
-	/// Pointer to Hyperion for writing led values
-	Hyperion * _hyperion;
 };

include/grabber/OsxWrapper.h

@@ -1,27 +1,23 @@
 #pragma once
 
-// QT includes
-#include <QObject>
-#include <QTimer>
-
 // Utils includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
 #include <utils/ColorRgba.h>
 #include <utils/GrabbingMode.h>
 #include <utils/VideoMode.h>
+#include <hyperion/GrabberWrapper.h>
 
 // Forward class declaration
 class OsxFrameGrabber;
-class Hyperion;
 class ImageProcessor;
 
 ///
 /// The OsxWrapper uses an instance of the OsxFrameGrabber to obtain ImageRgb's from the
 /// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
 /// attached Hyperion.
 ///
-class OsxWrapper: public QObject
+class OsxWrapper: public GrabberWrapper
 {
 	Q_OBJECT
 public:
@@ -42,20 +38,10 @@ class OsxWrapper: public QObject
 	virtual ~OsxWrapper();
 
 public slots:
-	///
-	/// Starts the grabber wich produces led values with the specified update rate
-	///
-	void start();
-
 	///
 	/// Performs a single frame grab and computes the led-colors
 	///
-	void action();
-
-	///
-	/// Stops the grabber
-	///
-	void stop();
+	virtual void action();
 
 	///
 	/// Set the grabbing mode
@@ -69,30 +55,17 @@ public slots:
 	///
 	void setVideoMode(const VideoMode videoMode);
 
-signals:
-	void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
-
 private:
 	/// The update rate [Hz]
 	const int _updateInterval_ms;
 	/// The timeout of the led colors [ms]
 	const int _timeout_ms;
-	/// The priority of the led colors
-	const int _priority;
-
-	/// The timer for generating events with the specified update rate
-	QTimer _timer;
 
 	/// The image used for grabbing frames
 	Image<ColorRgb> _image;
 	/// The actual grabber
-	OsxFrameGrabber * _frameGrabber;
-	/// The processor for transforming images to led colors
-	ImageProcessor * _processor;
+	OsxFrameGrabber * _grabber;
 
 	/// The list with computed led colors
 	std::vector<ColorRgb> _ledColors;
-
-	/// Pointer to Hyperion for writing led values
-	Hyperion * _hyperion;
 };