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

Fix V4L2

Browse Source
This commit is contained in:
Paulchen-Panther 2019-01-07 18:13:49 +01:00
parent 2dca1c93e6
commit 2cda2a11e0
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/hyperion/Grabber.h
View File

@ -35,6 +35,7 @@ public:
///
/// @brief Apply new width/height values, on errors (collide with cropping) reject the values
/// @return True on success else false
///
virtual bool setWidthHeight(int width, int height);

4
libsrc/grabber/v4l2/V4L2Grabber.cpp
View File

@ -952,10 +952,6 @@ void V4L2Grabber::setPixelDecimation(int pixelDecimation)
if(_pixelDecimation != pixelDecimation)
{
_pixelDecimation = pixelDecimation;
uninit();
// start if init is a success
if(init())
start();
_imageResampler.setHorizontalPixelDecimation(pixelDecimation);
_imageResampler.setVerticalPixelDecimation(pixelDecimation);
}

6
src/hyperiond/hyperiond.cpp
View File

@ -419,8 +419,6 @@ void HyperionDaemon::createGrabberDispmanx()
connect(this, &HyperionDaemon::videoMode, _dispmanx, &DispmanxWrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _dispmanx, &DispmanxWrapper::handleSettingsUpdate);
_dispmanx->start();
Info(_log, "DISPMANX frame grabber created");
#else
Error( _log, "The dispmanx framegrabber can not be instantiated, because it has been left out from the build");
@ -438,7 +436,6 @@ void HyperionDaemon::createGrabberAmlogic()
connect(this, &HyperionDaemon::videoMode, _amlGrabber, &AmlogicWrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _amlGrabber, &AmlogicWrapper::handleSettingsUpdate);
_amlGrabber->start();
Info(_log, "AMLOGIC grabber created");
#else
Error( _log, "The AMLOGIC grabber can not be instantiated, because it has been left out from the build");
@ -458,7 +455,6 @@ void HyperionDaemon::createGrabberX11(const QJsonObject & grabberConfig)
connect(this, &HyperionDaemon::videoMode, _x11Grabber, &X11Wrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _x11Grabber, &X11Wrapper::handleSettingsUpdate);
_x11Grabber->start();
Info(_log, "X11 grabber created");
#else
Error(_log, "The X11 grabber can not be instantiated, because it has been left out from the build");
@ -496,7 +492,6 @@ void HyperionDaemon::createGrabberFramebuffer(const QJsonObject & grabberConfig)
connect(this, &HyperionDaemon::videoMode, _fbGrabber, &FramebufferWrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _fbGrabber, &FramebufferWrapper::handleSettingsUpdate);
_fbGrabber->start();
Info(_log, "Framebuffer grabber created");
#else
Error(_log, "The framebuffer grabber can not be instantiated, because it has been left out from the build");
@ -516,7 +511,6 @@ void HyperionDaemon::createGrabberOsx(const QJsonObject & grabberConfig)
connect(this, &HyperionDaemon::videoMode, _osxGrabber, &OsxWrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _osxGrabber, &OsxWrapper::handleSettingsUpdate);
_osxGrabber->start();
Info(_log, "OSX grabber created");
#else
Error(_log, "The osx grabber can not be instantiated, because it has been left out from the build");

3
src/hyperiond/main.cpp
View File

@ -2,6 +2,7 @@
#include <csignal>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#ifndef __APPLE__
/* prctl is Linux only */
@ -177,7 +178,7 @@ int main(int argc, char** argv)
if (logLevelCheck > 1)
{
Error(log, "aborting, because options --silent --verbose --debug can't used together");
Error(log, "aborting, because options --silent --verbose --debug can't be used together");
return 0;
}

2
src/hyperiond/systray.cpp
View File

@ -25,7 +25,7 @@ SysTray::SysTray(HyperionDaemon *hyperiond)
Q_INIT_RESOURCE(resources);
// webserver port
WebServer* webserver = _hyperiond->getWebServerInstance();
WebServer* webserver = hyperiond->getWebServerInstance();
connect(webserver, &WebServer::portChanged, this, &SysTray::webserverPortChanged);
_hyperion = Hyperion::getInstance();