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

fix effect overlay not evaluated correctly

Browse Source
This commit is contained in:
redPanther 2016-10-14 20:13:45 +02:00 committed by GitHub
parent 6a06dfabdd
commit f881a0abe3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/effectengine/EffectEngine.cpp
View File

@ -43,15 +43,15 @@ EffectEngine::EffectEngine(Hyperion * hyperion, const QJsonObject & jsonEffectCo
efxPathList << ":/effects/"; efxPathList << ":/effects/";
QStringList disableList; QStringList disableList;
QJsonArray::ConstIterator iterPaths = paths.begin(); for(auto p : paths)
QJsonArray::ConstIterator iterDisabledEfx = disabledEfx.begin(); {
efxPathList << p.toString();
for(; iterPaths != paths.end() and iterDisabledEfx != disabledEfx.end() ; ++iterPaths, ++iterDisabledEfx)
{
efxPathList << (*iterPaths).toString();
disableList << (*iterDisabledEfx).toString();
} }
for(auto efx : disabledEfx)
{
disableList << efx.toString();
}
std::map<QString, EffectDefinition> availableEffects; std::map<QString, EffectDefinition> availableEffects;
foreach (const QString & path, efxPathList ) foreach (const QString & path, efxPathList )
{ {
@ -83,6 +83,10 @@ EffectEngine::EffectEngine(Hyperion * hyperion, const QJsonObject & jsonEffectCo
} }
Info(_log, "%d effects loaded from directory %s", efxCount, path.toUtf8().constData()); Info(_log, "%d effects loaded from directory %s", efxCount, path.toUtf8().constData());
} }
else
{
Warning(_log, "Effect path \"%s\" does not exist",path.toUtf8().constData() );
}
} }
foreach(auto item, availableEffects) foreach(auto item, availableEffects)