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

Added the possibility for scripts to have an argument string

Browse Source 
Former-commit-id: 7c5cec34be56d926edda1c9955dc57de838622f9
This commit is contained in:
johan
2013-11-30 00:28:04 +01:00
parent 121f56ca32
commit 554bc30c35
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/effectengine/Effect.cpp
View File

@@ -17,10 +17,12 @@ PyMethodDef Effect::effectMethods[] = {
};
Effect::Effect(int priority, int timeout) :
Effect::Effect(int priority, int timeout, const std::string & script, const std::string & args) :
QThread(),
_priority(priority),
_timeout(timeout),
_script(script),
_args(args),
_endTime(-1),
_interpreterThreadState(nullptr),
_abortRequested(false),
@@ -47,6 +49,9 @@ void Effect::run()
// add ledCount variable to the interpreter
PyObject_SetAttrString(module, "ledCount", Py_BuildValue("i", _imageProcessor->getLedCount()));
// add a args variable to the interpreter
PyObject_SetAttrString(module, "args", Py_BuildValue("s", _args.c_str()));
// Set the end time if applicable
if (_timeout > 0)
{
@@ -54,9 +59,15 @@ void Effect::run()
}
// Run the effect script
std::string script = "test.py";
FILE* file = fopen(script.c_str(), "r");
PyRun_SimpleFile(file, script.c_str());
FILE* file = fopen(_script.c_str(), "r");
if (file != nullptr)
{
PyRun_SimpleFile(file, _script.c_str());
}
else
{
std::cerr << "Unable to open script file " << _script << std::endl;
}
// Clean up the thread state
Py_EndInterpreter(_interpreterThreadState);