Make scale and tuning frequency global.

Author: Archie3d

Source/aeolus/engine.cpp

@@ -33,7 +33,8 @@ class PrepareRankwaveJob : ThreadPoolJob
         : ThreadPoolJob(rw->getStopName())
         , _rankwave{rw}
         , _sampleRate{sampleRate}
-    {    
+
+    {
     }
 
     JobStatus runJob() override
@@ -52,6 +53,8 @@ class PrepareRankwaveJob : ThreadPoolJob
 
 EngineGlobal::EngineGlobal()
     : _rankwaves{}
+    , _scale(Scale::EqualTemp)
+    , _tuningFrequency(440.0f)
 {
     loadRankwaves();
     loadIRs();
@@ -108,6 +111,8 @@ void EngineGlobal::loadRankwaves()
         jassert(synth);
 
         auto rankwave = std::make_unique<Rankwave>(*synth);
+        rankwave->createPipes(_scale, _tuningFrequency);
+
         auto* ptr = rankwave.get();
         _rankwaves.add(rankwave.release());
         _rankwavesByName.set(ptr->getStopName(), ptr);

Source/aeolus/engine.h

@@ -21,6 +21,7 @@
 
 #include "aeolus/globals.h"
 #include "aeolus/ringbuffer.h"
+#include "aeolus/scale.h"
 #include "aeolus/voice.h"
 #include "aeolus/addsynth.h"
 #include "aeolus/rankwave.h"
@@ -70,6 +71,12 @@ class EngineGlobal : public juce::DeletedAtShutdown
 
     void updateStops(float sampleRate);
 
+    float getTuningFrequency() const noexcept { return _tuningFrequency; }
+    void setTuningFrequenct(float f) noexcept { _tuningFrequency = f; }
+
+    const Scale& getScale() const noexcept { return _scale; }
+    void setScaleType(Scale::Type type) noexcept { _scale.setType(type); }
+
     JUCE_DECLARE_SINGLETON (EngineGlobal, false)
 
 private:
@@ -84,6 +91,9 @@ class EngineGlobal : public juce::DeletedAtShutdown
 
     std::vector<IR> _irs;
     int _longestIRLength;   ///< Longest IR length in samples
+
+    Scale _scale;
+    float _tuningFrequency;
 };
 
 //==============================================================================

Source/aeolus/rankwave.cpp

@@ -19,6 +19,7 @@
 // ----------------------------------------------------------------------------
 
 #include "rankwave.h"
+#include "engine.h"
 
 using namespace juce;
 
@@ -193,7 +194,6 @@ void Pipewave::genwave()
 {
     thread_local static Random rnd;
 
-
     const float sampleRate_r = 1.0f / _sampleRate;
 
     float m = _model.getNoteAttack(_note);
@@ -387,21 +387,24 @@ void Pipewave::attgain(float* att, int n, float p)
 
 //==============================================================================
 
-Rankwave::Rankwave(Addsynth& model, const Scale& scale)
+Rankwave::Rankwave(Addsynth& model)
     : _model(model)
     , _noteMin(model.getNoteMin())
     , _noteMax(model.getNoteMax())
-    , _scale(scale)
     , _pipes{}
 {
     jassert(_noteMax - _noteMin + 1 > 0);
+}
+
+void Rankwave::createPipes(const Scale& scale, float tuningFrequency)
+{
+    _pipes.clear();
 
     const auto fn = _model.getFn();
     const auto fd = _model.getFd();
-    const auto& s = scale.getTable();
 
-    float fbase = 440.0f;
-    fbase *= fn / (fd * s[9]);
+    const auto& s = scale.getTable();
+    float fbase = tuningFrequency * fn / (fd * s[9]);
 
     for (int i = _noteMin; i <= _noteMax; ++i) {
         auto pipe = std::make_unique<Pipewave>(_model, i - _noteMin, ldexpf(fbase * s[i % 12], i/12 - 5));
@@ -410,6 +413,21 @@ Rankwave::Rankwave(Addsynth& model, const Scale& scale)
     }
 }
 
+void Rankwave::retunePipes(const Scale& scale, float tuningFrequency)
+{
+    const auto fn = _model.getFn();
+    const auto fd = _model.getFd();
+
+    const auto& s = scale.getTable();
+    float fbase = tuningFrequency * fn / (fd * s[9]);
+
+    for (int i = _noteMin; i <= _noteMax; ++i) {
+        Pipewave* pipe = _pipes[i - _noteMin];
+        pipe->setFrequency(ldexpf(fbase * s[i % 12], i/12 - 5));
+
+    }
+}
+
 void Rankwave::prepareToPlay(float sampleRate)
 {
     for (auto* pipe : _pipes) {
@@ -422,6 +440,9 @@ Pipewave::State Rankwave::trigger(int note)
     if (note < _noteMin || note > _noteMax)
         return {};
 
+    int index = note - _noteMin;
+    jassert(index >= 0 && index < (int)_pipes.size());
+
     Pipewave* pipe = _pipes[note - _noteMin];
     return pipe->trigger();
 }

Source/aeolus/rankwave.h

@@ -74,6 +74,10 @@ class Pipewave
 
     const Addsynth& getModel() const noexcept { return _model; }
 
+    // After changing the frequency of the pipe, the wavetable must be regenerated
+    // by calling prepareToPlay() method.
+    void setFrequency(float f) noexcept { _freq = f; }
+
     int getNote() const noexcept { return _note + _model.getNoteMin(); }
     float getFreqency() const noexcept { return _freq; }
     float getPipeFrequency() const noexcept;
@@ -122,7 +126,12 @@ class Pipewave
 class Rankwave
 {
 public:
-    Rankwave(Addsynth& model, const Scale& scale = Scale(Scale::EqualTemp));
+    Rankwave(Addsynth& model);
+
+    void createPipes(const Scale& scale, float tuningFreq);
+
+    // Recalculate pipes tuning based on the current global scale and A4 frequency.
+    void retunePipes(const Scale& scale, float tuningFreq);
 
     juce::String getStopName() const { return _model.getStopName(); }
     bool isForNote(int note) const noexcept { return note >= _noteMin && note <= _noteMax; }
@@ -137,7 +146,6 @@ class Rankwave
     Addsynth& _model;
     int _noteMin;
     int _noteMax;
-    Scale _scale;
 
     juce::OwnedArray<Pipewave> _pipes;
 };

Source/aeolus/scale.h

@@ -48,6 +48,8 @@ class Scale
     using Map = std::map<Type, Table>;
 
     Scale(Type type = EqualTemp);
+    Type getType() const noexcept { return _type; }
+    void setType(Type t) noexcept { _type = t; }
 
     const Table& getTable() const;
 

Source/ui/StopButton.cpp

@@ -65,8 +65,8 @@ void StopButton::paintButton (Graphics& g, bool shouldDrawButtonAsHighlighted, b
     }
 
     g.setColour(color);
-    g.fillEllipse(bounds.getX() + offset, bounds.getY() + offset,
-                  bounds.getWidth() - 8, bounds.getHeight() - 8);
+    g.fillEllipse(float(bounds.getX() + offset), float(bounds.getY() + offset),
+                  float(bounds.getWidth() - 8), float(bounds.getHeight() - 8));
 
     Colour textColour = _stop.getType() == aeolus::Stop::Type::Reed
                                         ? (getToggleState() ? Colour(240, 40, 0) : Colour(128, 20, 0))