sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix small mistakes

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-07-30 13:48:07 +02:00
parent 3a665e503c
commit 42c4d964db
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Synth.cpp
View file

@ -1380,7 +1380,7 @@ void sfz::Synth::setupModMatrix()
} }
ASSERT(target); ASSERT(target);
if (!source) { if (!target) {
DBG("[sfizz] Failed to register modulation target"); DBG("[sfizz] Failed to register modulation target");
continue; continue;
} }

14
tests/ModulationsT.cpp
View file

@ -34,20 +34,22 @@ TEST_CASE("[Modulations] Flags")
static auto* checkBasicFlags = +[](int flags) static auto* checkBasicFlags = +[](int flags)
{ {
REQUIRE(flags != sfz::kModFlagsInvalid); REQUIRE(flags != sfz::kModFlagsInvalid);
REQUIRE(((flags & sfz::kModIsPerCycle) ^ REQUIRE((bool(flags & sfz::kModIsPerCycle) +
(flags & sfz::kModIsPerVoice)) != 0); bool(flags & sfz::kModIsPerVoice)) == 1);
}; };
static auto* checkSourceFlags = +[](int flags) static auto* checkSourceFlags = +[](int flags)
{ {
checkBasicFlags(flags); checkBasicFlags(flags);
// nothing else REQUIRE((bool(flags & sfz::kModIsAdditive) +
bool(flags & sfz::kModIsMultiplicative) +
bool(flags & sfz::kModIsPercentMultiplicative)) == 0);
}; };
static auto* checkTargetFlags = +[](int flags) static auto* checkTargetFlags = +[](int flags)
{ {
checkBasicFlags(flags); checkBasicFlags(flags);
REQUIRE(((flags & sfz::kModIsAdditive) ^ REQUIRE((bool(flags & sfz::kModIsAdditive) +
(flags & sfz::kModIsMultiplicative) ^ bool(flags & sfz::kModIsMultiplicative) +
(flags & sfz::kModIsPercentMultiplicative)) != 0); bool(flags & sfz::kModIsPercentMultiplicative)) == 1);
}; };
sfz::ModIds::forEachSourceId([](sfz::ModId id) sfz::ModIds::forEachSourceId([](sfz::ModId id)