Merge remote-tracking branch 'origin/develop' into feature/new-heavy

Author: dromer

.github/workflows/c-cpp.yml

@@ -23,6 +23,10 @@ jobs:
       uses: mymindstorm/setup-emsdk@v7
       with:
         version: 2.0.10
+    - name: Setup python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
     - name: make
       run: make
     - name: make check

.gitmodules

@@ -2,3 +2,7 @@
 	path = Libraries/DaisySP
 	url = https://github.com/electro-smith/DaisySP.git
 	branch = master
+[submodule "Tools/hvcc"]
+	path = Tools/hvcc
+	url = https://github.com/pingdynasty/hvcc.git
+	branch = develop

FaustSource/owl.cpp

@@ -911,7 +911,15 @@ class OwlUI : public UI {
             }
             else if (strcasecmp(id, "PUSH") == 0)
                 fButton = PUSHBUTTON;
-        }
+	    else if (strcasecmp(id, "ButtonA") == 0)
+                fButton = BUTTON_A;
+            else if (strcasecmp(id, "ButtonB") == 0)
+                fButton = BUTTON_B;
+            else if (strcasecmp(id, "ButtonC") == 0)
+                fButton = BUTTON_C;
+            else if (strcasecmp(id, "ButtonD") == 0)
+                fButton = BUTTON_D;
+	}
         // else if (strcasecmp(k, "midi") == 0) {
 	//   if (strcasecmp(id, "pitchwheel") == 0){ // PB
 	//   }else if (strcasecmp(id, "ctrl") == 0){ // CC

GenSource/GenPatch.hpp

@@ -3,6 +3,7 @@
 
 #include "Patch.h"
 #include "gen.h"
+#include "genlib.h"
 #include "PatchMetadata.h"
 
 #if __has_include("metadata.h")
@@ -105,8 +106,8 @@ class GenParameter : public GenParameterBase {
 public:
   PatchParameterId pid;
   int8_t index;
-  float min = 0.0;
-  float max = 1.0;
+  float min = 0.0f;
+  float max = 1.0f;
   GenParameter(Patch* patch, CommonState *context, const char* name, PatchParameterId id, int8_t idx) : pid(id), index(idx) {
 #ifndef OWL_METADATA
     patch->registerParameter(id, name);
@@ -222,7 +223,7 @@ class GenPatch : public Patch {
     for(int ch=channels; ch<gen::num_outputs(); ++ch)
       buffers[ch] = new float[getBlockSize()];
 
-    size_t nof_outs = gen::num_outputs()-min(gen::num_outputs(), channels);
+    size_t nof_outs = gen::num_outputs()-std::min((size_t)gen::num_outputs(), channels);
     // debugMessage("outs", (int)channels, nof_outs, sizeof(OutputParameter[nof_outs]));
     if(nof_outs > 0)
       outputs = SimpleArray<OutputParameter>(new OutputParameter[nof_outs], nof_outs);
@@ -231,12 +232,22 @@ class GenPatch : public Patch {
     for(int i=0; i<PatchMetadata::parameter_count; ++i){
       const PatchMetadata::Control& ctrl = PatchMetadata::parameters[i];
       PatchParameterId pid = (PatchParameterId)ctrl.id;
-      registerParameter(pid, ctrl.name);
       if(ctrl.flags & CONTROL_OUTPUT){
 	if(outputindex < nof_outs)
 	  outputs[outputindex] = OutputParameter(pid, ctrl.name, FloatArray(buffers[channels+outputindex], getBlockSize()));
 	outputindex++;
       }
+      size_t len = strlen(ctrl.name);
+      if(ctrl.flags & CONTROL_OUTPUT && ctrl.name[len-1] != '>'){
+	// add a > at end of name
+	char name[len+2];
+	strcpy(name, ctrl.name);
+	name[len] = '>';
+	name[len+1] = '\0';
+	registerParameter(pid, name);
+      }else{
+	registerParameter(pid, ctrl.name);
+      }
     }
     for(int i=0; i<PatchMetadata::button_count; ++i){
       const PatchMetadata::Control& ctrl = PatchMetadata::buttons[i];

GenSource/genlib.cpp

@@ -463,4 +463,17 @@ short genlib_setstate(CommonState *cself, const char *state, setparameter_method
 
 	return 0;
 }
+#else
+short genlib_setstate(CommonState *cself, const char *state, setparameter_method setmethod)
+{
+  return 0;
+}
+short genlib_getstate(CommonState *cself, char *state, getparameter_method getmethod)
+{
+  return 0;
+}
+size_t genlib_getstatesize(CommonState *cself, getparameter_method getmethod)
+{
+  return 0;
+}
 #endif

GenSource/genlib_ops.h

@@ -22,6 +22,9 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "genlib_common.h"	// common to common code and any host code
 #include "genlib.h"			// this file is different for different "hosts"
+#ifdef clamp
+#undef clamp
+#endif
 
 //////////// genlib_ops.h ////////////
 

HISTORY.md

@@ -1,8 +1,33 @@
+v22.2
+-----
+* Added NoiseOscillator (whitenoise s+h)
+* Added PhaseShiftOscillator template
+* Added Biquad allpass filter configuration
+* Fixed Antialiased oscillators (Triangle, SquareWave, Ramp)
+* Added MorphingOscillator
+* AdjustableTapTempo interface changes
+* CircularBuffer improvements, added isFull()
+* Added InvertedRampOscillator
+* Added StateVariableFilter::setAllpass() and processLowMidHighBand()
+* Improved realloc implementation
+* Block based SineOscillator::generate() with FM
+* Added test patches for automatic CI builds
+* Automatically add '>' to end of gen~ output parameters
+* Updated to use C++17
+* Use std::min/max/abs/clamp instead of macros for C++
+* Refactored AdsrEnvelope to Linear and Exponential versions
 * Updated CMSIS libraries
 
 v21.2
 -----
 
+* Added FloatArray::softclip()
+* Added clamp(x, lo, hi) macro
+* Added TapTempo
+* Added DryWetProcessors
+* Added FeedbackProcessors
+* Added CrossFadingDelayProcessor
+* Added AudioBuffer::copyFrom(), copyTo(), multiply() and add()
 * Added Sample oscillator
 * Added Agnesi curve oscillator
 * Added MPE processor

LibSource/AbstractSynth.h

@@ -10,9 +10,20 @@ class AbstractSynth : public Synth, public MidiProcessor, public VelocityCurve {
 protected:
   uint8_t note = 60; // C4
   float pb = 0;
-  float pb_range = 2;
+  float pb_range = 2/8192.0f;
+  float mod_range = 0.5/127.0f;
+  float tuning = 440;
 public:
   virtual ~AbstractSynth(){}
+  /**
+   * Set frequency in Hertz for middle A (defaults to Stuttgart pitch, A440, 440 Hz)
+   */
+  void setTuning(float value){
+    tuning = value;
+  }
+  float getTuning(){
+    return tuning;
+  }
   /**
    * Set note in whole semitones
    */
@@ -50,44 +61,54 @@ class AbstractSynth : public Synth, public MidiProcessor, public VelocityCurve {
    * Does not update the frequency; effective from next pitch bend change
    */
   void setPitchBendRange(float range){
-    this->pb_range = range;
-  }  
+    this->pb_range = range/8192.0f;
+  }
+  /**
+   * Set modulation depth range, from 0 to 1.0
+   */
+  void setModulationDepthRange(float range){
+    mod_range = range / 127.0f;
+  }
   // MIDI handlers
-  virtual void noteOn(MidiMessage msg) override {
+  virtual void noteOn(MidiMessage msg) {
     setNote(msg.getNote());
     setFrequency(noteToFrequency(note+pb));
     setGain(velocityToGain(msg.getVelocity()));
     gate(true);
   }
-  virtual void noteOff(MidiMessage msg) override {
+  virtual void noteOff(MidiMessage msg) {
     gate(false);
   }
-  virtual void controlChange(MidiMessage msg) override {
+  virtual void controlChange(MidiMessage msg) {
     if(msg.getControllerNumber() == MIDI_CC_MODULATION)
-      setModulation(msg.getControllerValue()/127.0f);
+      setModulation(msg.getControllerValue()/128.0f);
     else if(msg.getControllerNumber() == MIDI_ALL_NOTES_OFF)
       allNotesOff();
   }
-  virtual void channelPressure(MidiMessage msg) override {
-    setPressure(msg.getChannelPressure()/127.0f);
+  virtual void channelPressure(MidiMessage msg) {
+    setPressure(msg.getChannelPressure()/128.0f);
   }
-  virtual void polyKeyPressure(MidiMessage msg) override {
-    setPressure(msg.getPolyKeyPressure()/127.0f);
+  virtual void polyKeyPressure(MidiMessage msg) {
+    setPressure(msg.getPolyKeyPressure()/128.0f);
   }
-  virtual void setModulation(float modulation){} // default implementation does nothing
-  virtual void setPressure(float pressure){}
-  virtual void pitchbend(MidiMessage msg) override {
-    setPitchBend(pb_range*msg.getPitchBend()/8192.0f);
+  virtual void modulate(MidiMessage msg) {
+    setModulation(mod_range * msg.getControllerValue());
+  }
+  virtual void pitchbend(MidiMessage msg) {
+    setPitchBend(pb_range * msg.getPitchBend());
   }
   virtual void allNotesOff(){
     gate(false);
   }
+  // default implementations do nothing
+  virtual void setModulation(float modulation){} 
+  virtual void setPressure(float pressure){}
   // static utility methods
-  static inline float frequencyToNote(float freq){
-    return 12 * log2f(freq / 440) + 69;
+  inline float frequencyToNote(float freq){
+    return 12 * log2f(freq / tuning) + 69;
   }
-  static inline float noteToFrequency(float note){
-    return 440 * exp2f((note - 69) / 12);
+  inline float noteToFrequency(float note){
+    return tuning * exp2f((note - 69) / 12);
   }
 };