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

Corrected an error in the panCC computation

Browse source
This commit is contained in:
paulfd 2019-09-07 14:46:56 +02:00
parent 83fbfc1fcb
commit 91ed16367b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sfizz/Voice.cpp
View file

@ -64,6 +64,7 @@ void sfz::Voice::startVoice(Region* region, int delay, int channel, int number,
auto pan = basePan; auto pan = basePan;
if (region->panCC) if (region->panCC)
pan += normalizeCC(ccState[region->amplitudeCC->first]) * normalizeNegativePercents(region->amplitudeCC->second); pan += normalizeCC(ccState[region->amplitudeCC->first]) * normalizeNegativePercents(region->amplitudeCC->second);
pan += normalizeCC(ccState[region->panCC->first]) * normalizeNegativePercents(region->panCC->second);
panEnvelope.reset(pan); panEnvelope.reset(pan);
DBG("Base Panning: " << pan); DBG("Base Panning: " << pan);
@ -141,7 +142,7 @@ void sfz::Voice::registerCC(int delay, int channel [[maybe_unused]], int ccNumbe
} }
if (region->panCC && ccNumber == region->panCC->first) { if (region->panCC && ccNumber == region->panCC->first) {
const float newPan { basePan + normalizeCC(ccValue) * normalizeNegativePercents(region->amplitudeCC->second)}; const float newPan { basePan + normalizeCC(ccValue) * normalizeNegativePercents(region->panCC->second)};
panEnvelope.registerEvent(delay, newPan); panEnvelope.registerEvent(delay, newPan);
} }
} }