fixed bug where Blendronic was not tracking adaptiveTempo1

Princeton-CDH · Sep 7, 2021 · f36fc1e · f36fc1e
1 parent a034c25
commit f36fc1e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/bk_JUCE/bitKlavier/Source/Blendronic.cpp b/bk_JUCE/bitKlavier/Source/Blendronic.cpp
@@ -108,8 +108,10 @@ void BlendronicProcessor::tick(float* outputs)
     // Update the pulse length in case tempo or subdiv changed
     // possible to put this behind conditional, so we aren't doing these operations ever tick?
     pulseLength = (60.0 / (tempoPrep->getSubdivisions() * tempoPrep->getTempo()));
-    if (pulseLength != prevPulseLength) numSamplesBeat = prep->bBeats.value[beatIndex] * pulseLength * synth->getSampleRate();
+    pulseLength *= (general->getPeriodMultiplier() * tempo->getPeriodMultiplier());
 
+    if (pulseLength != prevPulseLength) numSamplesBeat = prep->bBeats.value[beatIndex] * pulseLength * synth->getSampleRate();
+
     // Check for beat change
     if (sampleTimer >= numSamplesBeat)
     {
@@ -160,8 +162,9 @@ void BlendronicProcessor::tick(float* outputs)
         // Set parameters of the delay object
         updateDelayParameters();
         resetPhase = true;
+        prevPulseLength = pulseLength;
     }
-    prevPulseLength = pulseLength;
+    //prevPulseLength = pulseLength;
 
     // Tick the delay
     delay->tick(outputs, Decibels::decibelsToGain(prep->outGain.value));
@@ -181,7 +184,7 @@ void BlendronicProcessor::tick(float* outputs)
 
 void BlendronicProcessor::processBlock(int numSamples, int midiChannel)
 {
-
+    // DBG("Blendronic tempo = " + String(tempo->getTempo()->prep->getTempo()));
 }
 
 void BlendronicProcessor::keyPressed(int noteNumber, Array<float>& targetVelocities, bool fromPress)
@@ -406,6 +409,7 @@ void BlendronicProcessor::prepareToPlay(double sr)
     feedbackIndex = 0;
 
     pulseLength = (60.0 / (tempoPrep->getSubdivisions() * tempoPrep->getTempo()));
+    pulseLength *= (general->getPeriodMultiplier() * tempo->getPeriodMultiplier());
     numSamplesBeat = prep->bBeats.value[beatIndex] * synth->getSampleRate() * pulseLength;
     numSamplesDelay = prep->bDelayLengths.value[delayIndex] * synth->getSampleRate() * pulseLength;
     if (pulseLength == INFINITY)