Added new tuning options

AugsEU · Oct 17, 2020 · 91a207a · 91a207a
1 parent c3c21ba
commit 91a207a
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 11 deletions.
diff --git a/Source/AugsVoice.cpp b/Source/AugsVoice.cpp
@@ -8,10 +8,26 @@ bool AugsVoice::canPlaySound(SynthesiserSound* sound)
 void AugsVoice::startNote(int midiNoteNumber, float velocity, SynthesiserSound*, int /*currentPitchWheelPosition*/)
 {
     mVelocity = velocity;
-    mOsc.setFrequency(MidiMessage::getMidiNoteInHertz(midiNoteNumber));
+    TuningType NoteTuningType = static_cast<TuningType>((int)rInterpolator.GetFloatOld(16));
+    mOsc.setFrequency(NoteNumberToHz(midiNoteNumber, NoteTuningType));
     mEnv.enterStage(EnvelopeGenerator::EnvelopeStage::ENVELOPE_STAGE_ATTACK);
 }
 
+double AugsVoice::NoteNumberToHz(int midiNoteNumber, TuningType TT)
+{
+    switch (TT)
+    {
+    case AugsVoice::TWELVE_TET:
+        return FREQ_A * std::pow(2.0, (midiNoteNumber - 69) / 12.0);
+    case AugsVoice::SEVEN_TWELVE_ET:
+        return FREQ_A * std::pow(1.5, (midiNoteNumber - 69) / 7.0);
+    case AugsVoice::FOUR_TWELVE_ET:
+        return FREQ_A * std::pow(1.25, (midiNoteNumber - 69) / 4.0);
+    default:
+        return 440.0f;
+    }
+}
+
 void AugsVoice::setEnvelope(double a, double d, double s, double r)
 {
     mEnv.setStageValue(EnvelopeGenerator::EnvelopeStage::ENVELOPE_STAGE_ATTACK, a);
@@ -42,6 +58,7 @@ void AugsVoice::controllerMoved(int controllerNumber, int newControllerValue) {}
 
 void AugsVoice::renderNextBlock(AudioBuffer<float>& outputBuffer, int startSample, int numSamples)
 {
+
     for (int sample = 0; sample < numSamples; sample++)
     {
         double Attack = rInterpolator.GetFloat(0, sample);
@@ -63,10 +80,11 @@ void AugsVoice::renderNextBlock(AudioBuffer<float>& outputBuffer, int startSampl
         float FilterRes = rInterpolator.GetFloat(10, sample);
         setFilter(FilterCut, FilterRes, FilterMode);
 
+        double Volume = rInterpolator.GetFloat(4, sample);
 
         double SampleVal = mOsc.nextSample();
         double EnvValue = mEnv.nextSample();
-        SampleVal = SampleVal * EnvValue * mVelocity;
+        SampleVal = SampleVal * EnvValue * mVelocity * Volume;
         mFilter.ProcessSample(SampleVal);
 
         if ((mEnv.getCurrentStage() == EnvelopeGenerator::EnvelopeStage::ENVELOPE_STAGE_OFF) || (EnvValue < minimumValue))

diff --git a/Source/AugsVoice.h b/Source/AugsVoice.h
@@ -13,6 +13,14 @@
 class AugsVoice : public SynthesiserVoice
 {
 public:
+	enum TuningType
+	{
+		TWELVE_TET = 0,
+		SEVEN_TWELVE_ET,
+		FOUR_TWELVE_ET,
+		kNumTuningTypes
+	};
+
 	bool canPlaySound(SynthesiserSound* sound) override;
 	void startNote(int midiNoteNumber, float velocity, SynthesiserSound* sound, int currentPitchWheelPosition) override;
 	void stopNote(float velocity, bool allowTailOff) override;
@@ -40,5 +48,5 @@ class AugsVoice : public SynthesiserVoice
 		mFilter.setMode(static_cast<FilterMode>(Mode));
 	}
 
-
+	double NoteNumberToHz(int midiNoteNumber, TuningType TT);
 };
diff --git a/Source/Defs.h b/Source/Defs.h
@@ -2,6 +2,7 @@
 #include <string>
 
 #define NUM_VOICES 8
+#define FREQ_A 440.0f
 
 typedef struct 
 {
@@ -13,7 +14,7 @@ typedef struct
     const double skewFactor;
 } FloatParam_Properties;
 
-#define NUM_FLOAT_PARAMS 16
+#define NUM_FLOAT_PARAMS 17
 const FloatParam_Properties FloatParamProps[NUM_FLOAT_PARAMS] =
 {       {"EnvAttack",   "Attack",   0.0,    3.0,    0.1,    0.6},//0
         {"EnvDecay",    "Decay",    0.0,    3.0,    0.1,    0.7},//1
@@ -24,13 +25,14 @@ const FloatParam_Properties FloatParamProps[NUM_FLOAT_PARAMS] =
         {"PowDist",     "Pow dist", 0.4,    5.0,    1.0,    0.7},
         {"TrimDist",    "Trim dist",0.0,    0.99,   0.0,    2.3},
         {"FilterTyp", "Filter type",0.0,    4.0,    0.0,    1.0},//8
-        {"CutOff",      "Cut Off",  50.0,   20000.0,1000.0, 0.5},
-        {"FiltRes",    "Resonance", 1.0,    10.0,   3.0, 0.6},
+        {"CutOff",      "Cut Off",  50.0,   20000.0,1000.0, 0.3},
+        {"FiltRes",    "Resonance", 1.0,    10.0,   3.0,    0.6},
         {"DelayVol",    "DlyVol",   0.0,    1.0,    0.0,    0.7},//11
         {"DelayFall",   "DlyFll",   0.0,    1.0,    0.5,    0.7}, //12
         {"DelayTime",   "DlyTm",    0.0,    2.0,    0.5,    0.6}, //13
         {"LowTyp",      "Low type", 0.0,    1.0,    0.0,    1.0}, //14
-        {"BandTyp",     "Band type",0.0,    1.0,    0.0,    1.0}, };//15
+        {"BandTyp",     "Band type",0.0,    1.0,    0.0,    1.0}, //15
+        {"Tuning",  "Scale Tuning" ,0.0,    2.0,    0.0,    1.0} }; //16
 
 //Filter Enums
 enum FilterMode

diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
@@ -72,6 +72,8 @@ void AugsSynthAudioProcessorEditor::InitGUI()
     InitSlider(DlyTimeSlider, 13);
     DlyTimeSlider.Slider.setTextValueSuffix("s");
 
+    //Tuning
+    InitCombo(TuningSelect, 16, { "12-TET","7-12-ET", "4-12-ET" });
 }
 
 void AugsSynthAudioProcessorEditor::InitSlider(Slider_Attach& MySlider, int Param_ID, double Increment, Slider::SliderStyle style)
@@ -124,6 +126,12 @@ void AugsSynthAudioProcessorEditor::paint (Graphics& g)
     g.drawSingleLineText("Pow", 14, GUI_SPACING * 2 + 473);
     g.drawSingleLineText("Trim", 14, GUI_SPACING * 3 + 473);
 
+    //Tuning
+    g.setColour(Colours::darkgrey);
+    g.drawRect(0, 410, 195, 60);
+    g.setColour(Colours::wheat);
+    g.drawSingleLineText("Tuning", 14, GUI_SPACING * 1 + 412);
+
     //ADSR
     g.setColour(Colours::darkgrey);
     g.drawRect(340, 0, 195, 80);
@@ -167,6 +175,9 @@ void AugsSynthAudioProcessorEditor::resized()
     PowerDistortionSlider.Slider.setBounds(2 * GUI_SPACING, 500, SliderWidth, GUI_SPACING);
     TrimDistortionSlider.Slider.setBounds(2 * GUI_SPACING, 500 + GUI_SPACING, SliderWidth, GUI_SPACING);
 
+    //Tuning
+    TuningSelect.ComboBox.setBounds(10, 440, 95, 20);
+
     //Filter
     FilterSelect.ComboBox.setBounds(245, 21, 95, 20);
     LowTypeSelect.ComboBox.setBounds(245, 42, 95, 20);

diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h
@@ -76,6 +76,9 @@ class AugsSynthAudioProcessorEditor : public AudioProcessorEditor, public MidiKe
     Slider_Attach DlyVolumeSlider;
     Slider_Attach DlyFallOffSlider;
     Slider_Attach DlyTimeSlider;
+
+    //Tuning
+    Combo_Attach TuningSelect;
 
 
 private:

diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -184,9 +184,8 @@ void AugsSynthAudioProcessor::processBlock(AudioSampleBuffer& buffer, MidiBuffer
             float TrimDist = 1 - mIterpolator.GetFloat(7, sample);
             ApplyDistort(MySample, PowDist, TrimDist);
 
-            //Volume
-            float Volume = mIterpolator.GetFloat(4, sample);
-            MySample *= Volume;
+
+
 
             SampleAverage += MySample;
             buffer.setSample(channel, sample, MySample);
@@ -201,7 +200,10 @@ void AugsSynthAudioProcessor::processBlock(AudioSampleBuffer& buffer, MidiBuffer
         mDelay.UpdateParameters(DelayVol, DelayFall, DelayTime, DelayTimeInSamples);
         float DelaySample = mDelay.ProcessSample(SampleAverage);
 
-        AddToAllChannels(DelaySample, sample, buffer);
+
+        //Volume
+        float Volume = mIterpolator.GetFloat(4, sample);
+        AddToAllChannels(DelaySample * Volume, sample, buffer);
     }
 }