even more changes

Signed-off-by: Paulchen-Panther <Paulchen--Panter@gmx.net>

include/grabber/DispmanxFrameGrabber.h

@@ -42,7 +42,7 @@ public:
 
 	///
 	///@brief Set new width and height for dispmanx, overwrite Grabber.h impl
-	virtual void setWidthHeight(int width, int height);
+	virtual bool setWidthHeight(int width, int height);
 
 private:
 	///

include/grabber/V4L2Grabber.h

@@ -14,6 +14,8 @@
 #include <hyperion/Grabber.h>
 #include <grabber/VideoStandard.h>
 
+class QTimer;
+
 /// Capture class for V4L2 devices
 ///
 /// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html
@@ -23,7 +25,6 @@ class V4L2Grabber : public Grabber
 
 public:
 	V4L2Grabber(const QString & device,
-			int input,
 			VideoStandard videoStandard,
 			PixelFormat pixelFormat,
 			int pixelDecimation
@@ -71,7 +72,7 @@ public:
 	///
 	/// @brief overwrite Grabber.h implementation
 	/// 
-	virtual void setInputVideoStandard(int input, VideoStandard videoStandard);
+	virtual void setDeviceVideoStandard(QString device, VideoStandard videoStandard);
 
 public slots:
 
@@ -86,6 +87,11 @@ signals:
 private slots:
 	int read_frame();
 
+	///
+	/// @brief Is called whenever the _readFrameAdaptTimer emits to unlock read_frame() through _readFrame bool
+	///
+	void unlockReadFrame() { _readFrame = true; };
+
 private:
 	void getV4Ldevices();
 
@@ -161,4 +167,6 @@ private:
 
 	bool _initialized;
 	bool _deviceAutoDiscoverEnabled;
+	QTimer* _readFrameAdaptTimer;
+	bool _readFrame = false;
 };

include/grabber/V4L2Wrapper.h

@@ -9,7 +9,6 @@ class V4L2Wrapper : public GrabberWrapper
 
 public:
 	V4L2Wrapper(const QString & device,
-			int input,
 			VideoStandard videoStandard,
 			PixelFormat pixelFormat,
 			int pixelDecimation );

include/grabber/X11Grabber.h

@@ -42,7 +42,7 @@ public:
 	///
 	/// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions
 	///
-	virtual void setWidthHeight(int width, int height);
+	virtual bool setWidthHeight(int width, int height) { return true; };
 
 	///
 	/// @brief Apply new pixelDecimation