Merge pull request #102 from pingdynasty/feature/ci-build-patches

Feature/ci build patches

Author: pingdynasty

.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

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);

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

HISTORY.md

@@ -1,3 +1,5 @@
+* 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++

LibSource/AbstractSynth.h

@@ -70,31 +70,31 @@ class AbstractSynth : public Synth, public MidiProcessor, public VelocityCurve {
     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()/128.0f);
     else if(msg.getControllerNumber() == MIDI_ALL_NOTES_OFF)
       allNotesOff();
   }
-  virtual void channelPressure(MidiMessage msg) override {
+  virtual void channelPressure(MidiMessage msg) {
     setPressure(msg.getChannelPressure()/128.0f);
   }
-  virtual void polyKeyPressure(MidiMessage msg) override {
+  virtual void polyKeyPressure(MidiMessage msg) {
     setPressure(msg.getPolyKeyPressure()/128.0f);
   }
-  virtual void modulate(MidiMessage msg) override {
+  virtual void modulate(MidiMessage msg) {
     setModulation(mod_range * msg.getControllerValue());
   }
-  virtual void pitchbend(MidiMessage msg) override {
+  virtual void pitchbend(MidiMessage msg) {
     setPitchBend(pb_range * msg.getPitchBend());
   }
   virtual void allNotesOff(){

LibSource/MonochromeScreenPatch.cpp

@@ -88,7 +88,7 @@ void MonochromeScreenBuffer::fade(uint16_t steps){
 
 template<>
 void MonochromeScreenBuffer::fill(Colour c) {
-  memset(pixels, c, height*width/8);
+  memset(pixels, c == WHITE ? 0xff : 0x00, height*width/8);
   // for(unsigned int i=0; i<height*width; ++i)
   //   pixels[i] = c;
 }

LibSource/ShortFastFourierTransform.cpp

@@ -34,7 +34,7 @@ void ShortFastFourierTransform::ifft(ComplexShortArray in, ShortArray out){
   arm_rfft_q15(&instance, (int16_t*)in.getData(), (int16_t*)out.getData());
 }
 
-int ShortFastFourierTransform::getSize(){
+size_t ShortFastFourierTransform::getSize(){
   return len;
 }
 
@@ -78,7 +78,7 @@ void ShortFastFourierTransform::ifft(ComplexShortArray input, ShortArray output)
   }
 }
 
-int ShortFastFourierTransform::getSize(){
+size_t ShortFastFourierTransform::getSize(){
   return temp.getSize();
 }
 

LibSource/ShortFastFourierTransform.h

@@ -73,7 +73,7 @@ class ShortFastFourierTransform {
    * Get the size of the FFT
    * @return The size of the FFT
   */
-  int getSize();
+  size_t getSize();
 };
 
 #endif // __ShortFastFourierTransform_h__

Makefile

@@ -45,7 +45,11 @@ PATCHNAME   ?= $(SOUL)
 PATCHCLASS  ?= SoulPatch
 PATCHFILE   ?= SoulPatch.hpp
 SOULCLASS   ?= $(SOUL)
+ifneq ("$(wildcard $(PATCHSOURCE)/$(SOUL).soulpatch)","")
 SOULFILE    ?= $(SOUL).soulpatch
+else
+SOULFILE    ?= $(SOUL).soul
+endif
 SOULHPP     ?= $(SOUL).hpp
 DEPS        += soul
 else ifdef TEST
@@ -181,10 +185,17 @@ run: $(DEPS) ## run patch natively
 grind: $(DEPS) ## run valgrind on patch natively
 	@$(MAKE) -s -f native.mk grind
 
-check: ## run test patches and unit tests natively
+check: ## run test patches and unit tests
 	@for nm in $(TESTS) ; do \
 		$(MAKE) -s TEST=$$nm test || exit;\
 	done
+	@unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/CppTest PATCHNAME=CppTest clean patch web run
+	@unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/GenTest GEN=MIDItestMinMax clean patch web run
+	# @unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/FaustTest FAUST=FaustTest clean patch web run # FAUST is not installed for CI
+	@cp FaustSource/*.h TestPatches/FaustTest && unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/FaustTest PATCHNAME=Faust clean patch web run
+	# @unset PATCHNAME PATCHCLASS PATCHFILE SOULCLASS SOULFILE SOULHPP && $(MAKE) PATCHSOURCE=TestPatches/SoulTest SOUL=SineSynth clean patch web run # SOUL is not installed for CI
+	@unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/SoulTest PATCHNAME=Soul clean patch web run
+	@pip install -r Tools/hvcc/requirements.txt && unset PATCHNAME PATCHCLASS PATCHFILE && $(MAKE) PATCHSOURCE=TestPatches/HeavyTest HEAVY=HeavyTest clean patch web run
 
 help: ## show this help
 	@echo 'Usage: make [target] ...'