frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

made sure v4l code only initializes when needed and only errors when … (#162)

Browse Source 
* made sure v4l code only initializes when needed and only errors when the module is enabled

* fixed v4l2 as suggested by @redPanther
This commit is contained in:
Rick van Hattem 2016-08-11 07:13:11 +02:00 committed by redPanther
parent 11441c91dc
commit 0d3f6c7ba1
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hyperiond/hyperiond.cpp
View File

@ -536,10 +536,10 @@ void HyperionDaemon::createGrabberOsx(const QJsonObject & grabberConfig)
void HyperionDaemon::createGrabberV4L2() void HyperionDaemon::createGrabberV4L2()
{ {
// construct and start the v4l2 grabber if the configuration is present // construct and start the v4l2 grabber if the configuration is present
#ifdef ENABLE_V4L2
if (_qconfig.contains("grabber-v4l2")) if (_qconfig.contains("grabber-v4l2"))
{ {
const QJsonObject & grabberConfig = _qconfig["grabber-v4l2"].toObject(); const QJsonObject & grabberConfig = _qconfig["grabber-v4l2"].toObject();
#ifdef ENABLE_V4L2
_v4l2Grabber = new V4L2Wrapper( _v4l2Grabber = new V4L2Wrapper(
grabberConfig["device"].toString("/dev/video0").toStdString(), grabberConfig["device"].toString("/dev/video0").toStdString(),
grabberConfig["input"].toInt(0), grabberConfig["input"].toInt(0),
@ -561,13 +561,17 @@ void HyperionDaemon::createGrabberV4L2()
grabberConfig["cropBottom"].toInt(0)); grabberConfig["cropBottom"].toInt(0));
Debug(_log, "V4L2 grabber created"); Debug(_log, "V4L2 grabber created");
QObject::connect(_v4l2Grabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), _protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) ); QObject::connect(_v4l2Grabber, SIGNAL(emitImage(int,
if (grabberConfig["enable"].toBool(true) && _v4l2Grabber->start()) const Image<ColorRgb>&, const int)), _protoServer,
{ SLOT(sendImageToProtoSlaves(int,
const Image<ColorRgb>&, const int)));
if (grabberConfig["enable"].toBool(true) && _v4l2Grabber->start()) {
Info(_log, "V4L2 grabber started"); Info(_log, "V4L2 grabber started");
} }
}
#else #else
ErrorIf(_qconfig.contains("grabber-v4l2"), _log, "The v4l2 grabber can not be instantiated, because it has been left out from the build"); if (grabberConfig["enable"].toBool(true)) {
Error(_log, "The v4l2 grabber can not be instantiated, because it has been left out from the build");
}
#endif #endif
}
} }