frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1714 (#1717)

Browse Source
This commit is contained in:
LordGrey 2024-03-15 20:23:53 +01:00 committed by GitHub
parent fedb409157
commit 806206ec01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/grabber/amlogic/AmlogicWrapper.h
View File

@ -18,12 +18,11 @@ public:
/// ///
/// Constructs the Amlogic frame grabber /// Constructs the Amlogic frame grabber
/// ///
/// @param[in] grabWidth The width of the grabbed image [pixels] /// @param[in] updateRate_Hz The image grab rate [Hz]
/// @param[in] grabHeight The height of the grabbed images [pixels] /// @param[in] pixelDecimation Decimation factor for image [pixels]///
/// @param[in] pixelDecimation Decimation factor for image [pixels]
/// ///
AmlogicWrapper(int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION, AmlogicWrapper(int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ); int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION);
/// ///
/// Constructs the Amlogic frame grabber from configuration settings /// Constructs the Amlogic frame grabber from configuration settings

5
libsrc/grabber/amlogic/AmlogicWrapper.cpp
View File

@ -1,6 +1,6 @@
#include <grabber/amlogic/AmlogicWrapper.h> #include <grabber/amlogic/AmlogicWrapper.h>
AmlogicWrapper::AmlogicWrapper(int pixelDecimation, int updateRate_Hz) AmlogicWrapper::AmlogicWrapper(int updateRate_Hz, int pixelDecimation)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz) : GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber() , _grabber()
{ {
@ -8,7 +8,8 @@ AmlogicWrapper::AmlogicWrapper(int pixelDecimation, int updateRate_Hz)
} }
AmlogicWrapper::AmlogicWrapper(const QJsonDocument& grabberConfig) AmlogicWrapper::AmlogicWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber) : AmlogicWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{ {
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

5
libsrc/grabber/directx/DirectXWrapper.cpp
View File

@ -13,7 +13,10 @@ DirectXWrapper::DirectXWrapper( int updateRate_Hz,
} }
DirectXWrapper::DirectXWrapper(const QJsonDocument& grabberConfig) 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); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

3
libsrc/grabber/dispmanx/DispmanxWrapper.cpp
View File

@ -12,7 +12,8 @@ DispmanxWrapper::DispmanxWrapper( int updateRate_Hz,
} }
DispmanxWrapper::DispmanxWrapper(const QJsonDocument& grabberConfig) DispmanxWrapper::DispmanxWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber) : DispmanxWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{ {
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

4
libsrc/grabber/framebuffer/FramebufferWrapper.cpp
View File

@ -10,7 +10,9 @@ FramebufferWrapper::FramebufferWrapper( int updateRate_Hz,
} }
FramebufferWrapper::FramebufferWrapper(const QJsonDocument& grabberConfig) FramebufferWrapper::FramebufferWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber) : FramebufferWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
0,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{ {
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

4
libsrc/grabber/osx/OsxWrapper.cpp
View File

@ -11,7 +11,9 @@ OsxWrapper::OsxWrapper( int updateRate_Hz,
} }
OsxWrapper::OsxWrapper(const QJsonDocument& grabberConfig) OsxWrapper::OsxWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber) : OsxWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
kCGDirectMainDisplay,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{ {
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

5
libsrc/grabber/qt/QtWrapper.cpp
View File

@ -12,7 +12,10 @@ QtWrapper::QtWrapper( int updateRate_Hz,
} }
QtWrapper::QtWrapper(const QJsonDocument& grabberConfig) 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); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

4
libsrc/grabber/x11/X11Wrapper.cpp
View File

@ -11,7 +11,9 @@ X11Wrapper::X11Wrapper( int updateRate_Hz,
} }
X11Wrapper::X11Wrapper(const QJsonDocument& grabberConfig) 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); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }

4
libsrc/grabber/xcb/XcbWrapper.cpp
View File

@ -11,7 +11,9 @@ XcbWrapper::XcbWrapper( int updateRate_Hz,
} }
XcbWrapper::XcbWrapper(const QJsonDocument& grabberConfig) 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); this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
} }