diff --git a/include/grabber/amlogic/AmlogicWrapper.h b/include/grabber/amlogic/AmlogicWrapper.h index 3f763f5c..5e355dff 100644 --- a/include/grabber/amlogic/AmlogicWrapper.h +++ b/include/grabber/amlogic/AmlogicWrapper.h @@ -18,12 +18,11 @@ public: /// /// Constructs the Amlogic frame grabber /// - /// @param[in] grabWidth The width of the grabbed image [pixels] - /// @param[in] grabHeight The height of the grabbed images [pixels] - /// @param[in] pixelDecimation Decimation factor for image [pixels] + /// @param[in] updateRate_Hz The image grab rate [Hz] + /// @param[in] pixelDecimation Decimation factor for image [pixels]/// /// - AmlogicWrapper(int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION, - int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ); + AmlogicWrapper(int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ, + int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION); /// /// Constructs the Amlogic frame grabber from configuration settings diff --git a/libsrc/grabber/amlogic/AmlogicWrapper.cpp b/libsrc/grabber/amlogic/AmlogicWrapper.cpp index d568e999..6c3b302c 100644 --- a/libsrc/grabber/amlogic/AmlogicWrapper.cpp +++ b/libsrc/grabber/amlogic/AmlogicWrapper.cpp @@ -1,14 +1,15 @@ #include -AmlogicWrapper::AmlogicWrapper(int pixelDecimation, int updateRate_Hz) +AmlogicWrapper::AmlogicWrapper(int updateRate_Hz, int pixelDecimation) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber() + , _grabber() { _grabber.setPixelDecimation(pixelDecimation); } AmlogicWrapper::AmlogicWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : AmlogicWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + GrabberWrapper::DEFAULT_PIXELDECIMATION) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/directx/DirectXWrapper.cpp b/libsrc/grabber/directx/DirectXWrapper.cpp index c0ba4ecc..1d5d905e 100644 --- a/libsrc/grabber/directx/DirectXWrapper.cpp +++ b/libsrc/grabber/directx/DirectXWrapper.cpp @@ -6,14 +6,17 @@ DirectXWrapper::DirectXWrapper( int updateRate_Hz, int cropLeft, int cropRight, int cropTop, int cropBottom ) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber(display, cropLeft, cropRight, cropTop, cropBottom) + , _grabber(display, cropLeft, cropRight, cropTop, cropBottom) { _grabber.setPixelDecimation(pixelDecimation); } DirectXWrapper::DirectXWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : DirectXWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + 0, + GrabberWrapper::DEFAULT_PIXELDECIMATION, + 0,0,0,0) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp index 32824762..0194a4f1 100644 --- a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp +++ b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp @@ -12,7 +12,8 @@ DispmanxWrapper::DispmanxWrapper( int updateRate_Hz, } DispmanxWrapper::DispmanxWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : DispmanxWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + GrabberWrapper::DEFAULT_PIXELDECIMATION) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp index 2588afed..1797e513 100644 --- a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp +++ b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp @@ -4,13 +4,15 @@ FramebufferWrapper::FramebufferWrapper( int updateRate_Hz, int deviceIdx, int pixelDecimation) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber(deviceIdx) + , _grabber(deviceIdx) { _grabber.setPixelDecimation(pixelDecimation); } FramebufferWrapper::FramebufferWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : FramebufferWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + 0, + GrabberWrapper::DEFAULT_PIXELDECIMATION) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/osx/OsxWrapper.cpp b/libsrc/grabber/osx/OsxWrapper.cpp index 86058d4f..d9bb51b8 100644 --- a/libsrc/grabber/osx/OsxWrapper.cpp +++ b/libsrc/grabber/osx/OsxWrapper.cpp @@ -5,13 +5,15 @@ OsxWrapper::OsxWrapper( int updateRate_Hz, int pixelDecimation ) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber(display) + , _grabber(display) { _grabber.setPixelDecimation(pixelDecimation); } OsxWrapper::OsxWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : OsxWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + kCGDirectMainDisplay, + GrabberWrapper::DEFAULT_PIXELDECIMATION) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/qt/QtWrapper.cpp b/libsrc/grabber/qt/QtWrapper.cpp index d4560676..1cb8287d 100644 --- a/libsrc/grabber/qt/QtWrapper.cpp +++ b/libsrc/grabber/qt/QtWrapper.cpp @@ -6,13 +6,16 @@ QtWrapper::QtWrapper( int updateRate_Hz, int cropLeft, int cropRight, int cropTop, int cropBottom ) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber(display, cropLeft, cropRight, cropTop, cropBottom) + , _grabber(display, cropLeft, cropRight, cropTop, cropBottom) { _grabber.setPixelDecimation(pixelDecimation); } QtWrapper::QtWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : QtWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + 0, + GrabberWrapper::DEFAULT_PIXELDECIMATION, + 0,0,0,0) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/x11/X11Wrapper.cpp b/libsrc/grabber/x11/X11Wrapper.cpp index d8df3cee..df2c5c51 100644 --- a/libsrc/grabber/x11/X11Wrapper.cpp +++ b/libsrc/grabber/x11/X11Wrapper.cpp @@ -4,14 +4,16 @@ X11Wrapper::X11Wrapper( int updateRate_Hz, int pixelDecimation, int cropLeft, int cropRight, int cropTop, int cropBottom) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) - , _grabber(cropLeft, cropRight, cropTop, cropBottom) - , _init(false) + , _grabber(cropLeft, cropRight, cropTop, cropBottom) + , _init(false) { _grabber.setPixelDecimation(pixelDecimation); } X11Wrapper::X11Wrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : X11Wrapper(GrabberWrapper::DEFAULT_RATE_HZ, + GrabberWrapper::DEFAULT_PIXELDECIMATION, + 0,0,0,0) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); } diff --git a/libsrc/grabber/xcb/XcbWrapper.cpp b/libsrc/grabber/xcb/XcbWrapper.cpp index aa3db000..c9d4abd4 100644 --- a/libsrc/grabber/xcb/XcbWrapper.cpp +++ b/libsrc/grabber/xcb/XcbWrapper.cpp @@ -11,7 +11,9 @@ XcbWrapper::XcbWrapper( int updateRate_Hz, } XcbWrapper::XcbWrapper(const QJsonDocument& grabberConfig) - : GrabberWrapper(GRABBERTYPE, &_grabber) + : XcbWrapper(GrabberWrapper::DEFAULT_RATE_HZ, + GrabberWrapper::DEFAULT_PIXELDECIMATION, + 0,0,0,0) { this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); }