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

Merge pull request #100 from MarcDahlem/master

Browse Source 
Added ability to define effect arguments for the bootsequence

Former-commit-id: afc8e8ea4e7f02039092bfca698e5e3e491604c2
This commit is contained in:
poljvd 2014-05-06 22:01:35 +02:00
commit 2d16d369a3
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hyperiond/hyperiond.cpp
View File

@ -112,14 +112,31 @@ int main(int argc, char** argv)
const std::string effectName = effectConfig["effect"].asString(); const std::string effectName = effectConfig["effect"].asString();
const unsigned duration_ms = effectConfig["duration_ms"].asUInt(); const unsigned duration_ms = effectConfig["duration_ms"].asUInt();
const int priority = 0; const int priority = 0;
if (hyperion.setEffect(effectName, priority, duration_ms) == 0) if (effectConfig.isMember("args"))
{ {
std::cout << "Boot sequence(" << effectName << ") created and started" << std::endl; const Json::Value effectConfigArgs = effectConfig["args"];
if (hyperion.setEffect(effectName, effectConfigArgs, priority, duration_ms) == 0)
{
std::cout << "Boot sequence(" << effectName << ") with user-defined arguments created and started" << std::endl;
}
else
{
std::cout << "Failed to start boot sequence: " << effectName << " with user-defined arguments" << std::endl;
}
} }
else else
{ {
std::cout << "Failed to start boot sequence: " << effectName << std::endl;
if (hyperion.setEffect(effectName, priority, duration_ms) == 0)
{
std::cout << "Boot sequence(" << effectName << ") created and started" << std::endl;
}
else
{
std::cout << "Failed to start boot sequence: " << effectName << std::endl;
}
} }
} }