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

update adjustments and ui (#384)

Browse Source 
* update

* update

* testit

* Revert "testit"

This reverts commit b1cc645161.

* update schema

* update

* add adjustment to serverinfo

* remove Adjustbool

* remove v4l2only

* fix json check for create effect

* update deb

* update

* update remote adjust

* update

* add eff schemas
This commit is contained in:
brindosch
2017-02-08 14:36:28 +01:00
committed by GitHub
parent d94529a800
commit 41671ad82c
80 changed files with 2341 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libsrc/hyperion/Hyperion.cpp
View File

@@ -392,7 +392,7 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
, _timer()
, _log(CORE_LOGGER)
, _hwLedCount(_ledString.leds().size())
, _colorAdjustmentV4Lonly(false)
, _sourceAutoSelectEnabled(true)
, _configHash()
, _ledGridSize(getLedLayoutGridSize(qjsonConfig["leds"]))
@@ -405,11 +405,6 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
}
// set color correction activity state
const QJsonObject& color = qjsonConfig["color"].toObject();
_adjustmentEnabled = color["channelAdjustment_enable"].toBool(true);
_colorAdjustmentV4Lonly = color["channelAdjustment_v4l_only"].toBool(false);
InfoIf(!_adjustmentEnabled , _log, "Color adjustment disabled" );
InfoIf(_colorAdjustmentV4Lonly , _log, "Color adjustment for v4l inputs only" );
// initialize the image processor factory
_ledMAppingType = ImageProcessor::mappingTypeToInt(color["imageToLedMappingType"].toString());
@@ -721,7 +716,7 @@ void Hyperion::update()
_ledBuffer.reserve(_hwLedCount);
_ledBuffer = priorityInfo.ledColors;
if ( _adjustmentEnabled && priority < PriorityMuxer::LOWEST_PRIORITY && (!_colorAdjustmentV4Lonly || priorityInfo.componentId == hyperion::COMP_V4L) )
if ( priority < PriorityMuxer::LOWEST_PRIORITY)
{
_raw2ledAdjustment->applyAdjustment(_ledBuffer);
}

25
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@@ -114,30 +114,17 @@
},
"propertyOrder" : 1
},
"channelAdjustment_enable" :
{
"type" : "boolean",
"title" : "edt_conf_color_channelAdjustment_enable_title",
"default" : true,
"propertyOrder" : 2
},
"channelAdjustment_v4l_only" :
{
"type" : "boolean",
"title" : "edt_conf_color_channelAdjustment_v4l_only_title",
"default" : false,
"propertyOrder" : 3
},
"channelAdjustment" :
{
"type" : "array",
"title" : "edt_conf_color_channelAdjustment_header_title",
"required" : true,
"propertyOrder" : 4,
"propertyOrder" : 3,
"items" :
{
"type" : "object",
"required" : true,
"title" : "edt_conf_color_channelAdjustment_header_itemtitle",
"properties" :
{
"id" :
@@ -287,7 +274,7 @@
"brightnessMin" :
{
"type" : "number",
"title" : "edt_conf_color_brightness_min_title",
"title" : "edt_conf_color_brightnessMin_title",
"required" : true,
"minimum" : 0.0,
"maximum": 1.0,
@@ -309,7 +296,7 @@
"gammaRed" :
{
"type" : "number",
"title" : "edt_conf_color_gamma_red_title",
"title" : "edt_conf_color_gammaRed_title",
"required" : true,
"minimum" : 0.0,
"maximum": 100.0,
@@ -320,7 +307,7 @@
"gammaGreen" :
{
"type" : "number",
"title" : "edt_conf_color_gamma_green_title",
"title" : "edt_conf_color_gammaGreen_title",
"required" : true,
"minimum" : 0.0,
"maximum": 100.0,
@@ -331,7 +318,7 @@
"gammaBlue" :
{
"type" : "number",
"title" : "edt_conf_color_gamma_blue_title",
"title" : "edt_conf_color_gammaBlue_title",
"required" : true,
"minimum" : 0.0,
"maximum": 100.0,