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

multi bugfix pr ... (#348)

Browse Source 
* move name to general
add a version for config file

* start impl. config migrator

* fix typo amd set access level

* fix schemaa name

* fix schema

* add structure for config migrator

* add more structural things for config migrator

* fix not all grabber provide live video

* add schema for trails
This commit is contained in:
redPanther
2016-12-24 10:02:12 +01:00
committed by GitHub
parent 8ed8823033
commit 3746f643af
20 changed files with 153 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,12 +39,9 @@ void AmlogicWrapper::action()
return;
}
if ( _forward )
{
Image<ColorRgb> image_rgb;
_image.toRgb(image_rgb);
emit emitImage(_priority, image_rgb, _timeout_ms);
}
Image<ColorRgb> image_rgb;
_image.toRgb(image_rgb);
emit emitImage(_priority, image_rgb, _timeout_ms);
_processor->process(_image, _ledColors);
setColors(_ledColors, _timeout_ms);

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

@@ -35,12 +35,9 @@ void DispmanxWrapper::action()
// Grab frame into the allocated image
_grabber->grabFrame(_image);
if ( _forward )
{
Image<ColorRgb> image_rgb;
_image.toRgb(image_rgb);
emit emitImage(_priority, image_rgb, _timeout_ms);
}
Image<ColorRgb> image_rgb;
_image.toRgb(image_rgb);
emit emitImage(_priority, image_rgb, _timeout_ms);
_processor->process(_image, _ledColors);
setColors(_ledColors, _timeout_ms);

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

@@ -31,10 +31,7 @@ void FramebufferWrapper::action()
// Grab frame into the allocated image
_grabber->grabFrame(_image);
if ( _forward )
{
emit emitImage(_priority, _image, _timeout_ms);
}
emit emitImage(_priority, _image, _timeout_ms);
_processor->process(_image, _ledColors);
setColors(_ledColors, _timeout_ms);

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

@@ -31,10 +31,7 @@ void OsxWrapper::action()
// Grab frame into the allocated image
_grabber->grabFrame(_image);
if ( _forward )
{
emit emitImage(_priority, _image, _timeout_ms);
}
emit emitImage(_priority, _image, _timeout_ms);
_processor->process(_image, _ledColors);
setColors(_ledColors, _timeout_ms);

6
libsrc/grabber/v4l2/V4L2Wrapper.cpp
View File

@@ -87,11 +87,7 @@ void V4L2Wrapper::set3D(VideoMode mode)
void V4L2Wrapper::newFrame(const Image<ColorRgb> &image)
{
// forward to other hyperions
//if ( _forward )
//{
emit emitImage(_priority, image, _timeout_ms);
//}
emit emitImage(_priority, image, _timeout_ms);
// process the new image
_processor->process(image, _ledColors);

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

@@ -64,10 +64,7 @@ void X11Wrapper::action()
// Grab frame into the allocated image
_grabber->grabFrame(_image);
//if ( _forward )
//{
emit emitImage(_priority, _image, _timeout_ms);
//}
emit emitImage(_priority, _image, _timeout_ms);
_processor->process(_image, _ledColors);
setColors(_ledColors, _timeout_ms);