mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Fixes
remove Brindosch's V4L2 stream notifier adaption avoid compilation 'note' on GCC 6 ARM
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
|
||||
#include <QDirIterator>
|
||||
#include <QFileInfo>
|
||||
#include <QTimer>
|
||||
|
||||
#include "grabber/V4L2Grabber.h"
|
||||
|
||||
@@ -52,12 +51,7 @@ V4L2Grabber::V4L2Grabber(const QString & device
|
||||
, _streamNotifier(nullptr)
|
||||
, _initialized(false)
|
||||
, _deviceAutoDiscoverEnabled(false)
|
||||
, _readFrameAdaptTimer(new QTimer(this))
|
||||
{
|
||||
// setup stream notify locker with 10hz
|
||||
connect(_readFrameAdaptTimer, &QTimer::timeout, this, &V4L2Grabber::unlockReadFrame);
|
||||
_readFrameAdaptTimer->setInterval(100);
|
||||
|
||||
setPixelDecimation(pixelDecimation);
|
||||
getV4Ldevices();
|
||||
|
||||
@@ -77,7 +71,6 @@ void V4L2Grabber::uninit()
|
||||
{
|
||||
Debug(_log,"uninit grabber: %s", QSTRING_CSTR(_deviceName));
|
||||
|
||||
_readFrameAdaptTimer->stop();
|
||||
stop();
|
||||
uninit_device();
|
||||
close_device();
|
||||
@@ -146,7 +139,6 @@ bool V4L2Grabber::init()
|
||||
opened = true;
|
||||
init_device(_videoStandard, _input);
|
||||
_initialized = true;
|
||||
_readFrameAdaptTimer->start();
|
||||
}
|
||||
}
|
||||
catch(std::exception& e)
|
||||
@@ -715,10 +707,6 @@ void V4L2Grabber::stop_capturing()
|
||||
|
||||
int V4L2Grabber::read_frame()
|
||||
{
|
||||
// read_frame() is called with 25Hz, adapt to 10Hz. In the end it's up to the stream notifier if we get calls or not
|
||||
if(!_readFrame) return -1;
|
||||
_readFrame = false;
|
||||
|
||||
bool rc = false;
|
||||
|
||||
try
|
||||
|
Reference in New Issue
Block a user