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

Rename v/r identifier vars to designate them as current

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-08-04 16:26:04 +02:00
parent 42c4d964db
commit acac06aae8
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/sfizz/modulations/ModMatrix.cpp
View file

@ -24,8 +24,8 @@ struct ModMatrix::Impl {
uint32_t samplesPerBlock_ {}; uint32_t samplesPerBlock_ {};
uint32_t numFrames_ {}; uint32_t numFrames_ {};
NumericId<Voice> voiceId_ {}; NumericId<Voice> currentVoiceId_ {};
NumericId<Region> regionId_ {}; NumericId<Region> currentRegionId_ {};
struct Source { struct Source {
ModKey key; ModKey key;
@ -249,8 +249,8 @@ void ModMatrix::beginVoice(NumericId<Voice> voiceId, NumericId<Region> regionId)
{ {
Impl& impl = *impl_; Impl& impl = *impl_;
impl.voiceId_ = voiceId; impl.currentVoiceId_ = voiceId;
impl.regionId_ = regionId; impl.currentRegionId_ = regionId;
for (Impl::Source &source : impl.sources_) { for (Impl::Source &source : impl.sources_) {
const int flags = source.key.flags(); const int flags = source.key.flags();
@ -268,8 +268,8 @@ void ModMatrix::endVoice()
{ {
Impl& impl = *impl_; Impl& impl = *impl_;
const uint32_t numFrames = impl.numFrames_; const uint32_t numFrames = impl.numFrames_;
const NumericId<Voice> voiceId = impl.voiceId_; const NumericId<Voice> voiceId = impl.currentVoiceId_;
const NumericId<Region> regionId = impl.regionId_; const NumericId<Region> regionId = impl.currentRegionId_;
for (Impl::Source &source : impl.sources_) { for (Impl::Source &source : impl.sources_) {
if (!source.bufferReady) { if (!source.bufferReady) {
@ -281,8 +281,8 @@ void ModMatrix::endVoice()
} }
} }
impl.voiceId_ = {}; impl.currentVoiceId_ = {};
impl.regionId_ = {}; impl.currentRegionId_ = {};
} }
float* ModMatrix::getModulation(TargetId targetId) float* ModMatrix::getModulation(TargetId targetId)
@ -291,7 +291,7 @@ float* ModMatrix::getModulation(TargetId targetId)
return nullptr; return nullptr;
Impl& impl = *impl_; Impl& impl = *impl_;
const NumericId<Region> regionId = impl.regionId_; const NumericId<Region> regionId = impl.currentRegionId_;
const uint32_t targetIndex = targetId.number(); const uint32_t targetIndex = targetId.number();
Impl::Target &target = impl.targets_[targetIndex]; Impl::Target &target = impl.targets_[targetIndex];
const int targetFlags = target.key.flags(); const int targetFlags = target.key.flags();
@ -329,7 +329,7 @@ float* ModMatrix::getModulation(TargetId targetId)
if (useThisSource) { if (useThisSource) {
if (isFirstSource) { if (isFirstSource) {
source.gen->generate(source.key, impl.voiceId_, buffer); source.gen->generate(source.key, impl.currentVoiceId_, buffer);
if (sourceDepth != 1) { if (sourceDepth != 1) {
for (uint32_t i = 0; i < numFrames; ++i) for (uint32_t i = 0; i < numFrames; ++i)
buffer[i] *= sourceDepth; buffer[i] *= sourceDepth;
@ -338,7 +338,7 @@ float* ModMatrix::getModulation(TargetId targetId)
} }
else { else {
absl::Span<float> temp(impl.temp_.data(), numFrames); absl::Span<float> temp(impl.temp_.data(), numFrames);
source.gen->generate(source.key, impl.voiceId_, temp); source.gen->generate(source.key, impl.currentVoiceId_, temp);
if (targetFlags & kModIsMultiplicative) { if (targetFlags & kModIsMultiplicative) {
for (uint32_t i = 0; i < numFrames; ++i) for (uint32_t i = 0; i < numFrames; ++i)
buffer[i] *= sourceDepth * temp[i]; buffer[i] *= sourceDepth * temp[i];