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

22
src/hyperion-remote/JsonConnection.cpp
View File

@@ -434,7 +434,7 @@ void JsonConnection::setAdjustment(
red.append(redAdjustment.red());
red.append(redAdjustment.green());
red.append(redAdjustment.blue());
adjust["redAdjust"] = red;
adjust["red"] = red;
}
if (greenAdjustment.isValid())
@@ -443,7 +443,7 @@ void JsonConnection::setAdjustment(
green.append(greenAdjustment.red());
green.append(greenAdjustment.green());
green.append(greenAdjustment.blue());
adjust["greenAdjust"] = green;
adjust["green"] = green;
}
if (blueAdjustment.isValid())
@@ -452,7 +452,7 @@ void JsonConnection::setAdjustment(
blue.append(blueAdjustment.red());
blue.append(blueAdjustment.green());
blue.append(blueAdjustment.blue());
adjust["blueAdjust"] = blue;
adjust["blue"] = blue;
}
if (cyanAdjustment.isValid())
{
@@ -460,7 +460,7 @@ void JsonConnection::setAdjustment(
cyan.append(cyanAdjustment.red());
cyan.append(cyanAdjustment.green());
cyan.append(cyanAdjustment.blue());
adjust["cyanAdjust"] = cyan;
adjust["cyan"] = cyan;
}
if (magentaAdjustment.isValid())
{
@@ -468,7 +468,7 @@ void JsonConnection::setAdjustment(
magenta.append(magentaAdjustment.red());
magenta.append(magentaAdjustment.green());
magenta.append(magentaAdjustment.blue());
adjust["magentaAdjust"] = magenta;
adjust["magenta"] = magenta;
}
if (yellowAdjustment.isValid())
{
@@ -476,7 +476,7 @@ void JsonConnection::setAdjustment(
yellow.append(yellowAdjustment.red());
yellow.append(yellowAdjustment.green());
yellow.append(yellowAdjustment.blue());
adjust["yellowAdjust"] = yellow;
adjust["yellow"] = yellow;
}
if (whiteAdjustment.isValid())
{
@@ -484,7 +484,7 @@ void JsonConnection::setAdjustment(
white.append(whiteAdjustment.red());
white.append(whiteAdjustment.green());
white.append(whiteAdjustment.blue());
adjust["whiteAdjust"] = white;
adjust["white"] = white;
}
if (blackAdjustment.isValid())
{
@@ -492,7 +492,7 @@ void JsonConnection::setAdjustment(
black.append(blackAdjustment.red());
black.append(blackAdjustment.green());
black.append(blackAdjustment.blue());
adjust["blackAdjust"] = black;
adjust["black"] = black;
}
if (brightnessMin != nullptr)
{
@@ -504,15 +504,15 @@ void JsonConnection::setAdjustment(
}
if (gammaR != nullptr)
{
adjust["gammaR"] = *gammaR;
adjust["gammaRed"] = *gammaR;
}
if (gammaG != nullptr)
{
adjust["gammaG"] = *gammaG;
adjust["gammaGreen"] = *gammaG;
}
if (gammaB != nullptr)
{
adjust["gammaB"] = *gammaB;
adjust["gammaBlue"] = *gammaB;
}
command["adjustment"] = adjust;

2
src/hyperion-remote/hyperion-remote.cpp
View File

@@ -85,7 +85,7 @@ int main(int argc, char * argv[])
ColorOption & argYAdjust = parser.add<ColorOption> ('Y', "yellowAdjustment", "Set the adjustment of the yellow color (requires colors in hex format as RRGGBB)");
ColorOption & argWAdjust = parser.add<ColorOption> ('W', "whiteAdjustment", "Set the adjustment of the white color (requires colors in hex format as RRGGBB)");
ColorOption & argbAdjust = parser.add<ColorOption> ('b', "blackAdjustment", "Set the adjustment of the black color (requires colors in hex format as RRGGBB)");
Option & argMapping = parser.add<Option> ('m', "ledMapping" , "Set the methode for image to led mapping valif values: multicolor:mean, unicolor_mean");
Option & argMapping = parser.add<Option> ('m', "ledMapping" , "Set the methode for image to led mapping valid values: multicolor_mean, unicolor_mean");
IntOption & argSource = parser.add<IntOption> (0x0, "sourceSelect" , "Set current active priority channel and deactivate auto source switching");
BooleanOption & argSourceAuto = parser.add<BooleanOption>(0x0, "sourceAutoSelect", "Enables auto source, if disabled prio by manual selecting input source");
BooleanOption & argSourceOff = parser.add<BooleanOption>(0x0, "sourceOff", "select no source, this results in leds activly set to black (=off)");

2
src/hyperiond/hyperiond.cpp
View File

@@ -376,7 +376,7 @@ void HyperionDaemon::startNetworkServices()
if (_udpListener != nullptr) {
BonjourServiceRegister *bonjourRegister_udp = new BonjourServiceRegister();
bonjourRegister_udp->registerService(
BonjourRecord(mDNSDescr.c_str(), "_hyperiond-rgbled._udp", QString()),
BonjourRecord(mDNSDescr.c_str(), "_hyperiond-udp._udp", QString()),
_udpListener->getPort()
);
Debug(_log, "UDP LIstener mDNS responder started");