Merge branch 'master' of https://github.com/pingdynasty/OwlProgram into web-audio

Author: smrq

Makefile

@@ -1,21 +1,45 @@
-BUILDROOT = .
+BUILDROOT ?= $(CURDIR)
 
 ifndef CONFIG
   CONFIG=Release
 endif
 
 ifeq ($(CONFIG),Debug)
 CPPFLAGS   = -g -Wall -Wcpp -Wunused-function -DDEBUG -DUSE_FULL_ASSERT
-ASFLAGS  = -g
+ASFLAGS    = -g
 endif
 
 ifeq ($(CONFIG),Release)
 CPPFLAGS   = -O2
 endif
 
+DEPS       = $(BUILD)/patch.cpp $(BUILD)/patch.h
+
+ifdef FAUST
+# options for FAUST compilation
+PATCHNAME   ?= $(FAUST)
+PATCHCLASS  ?= $(PATCHNAME)Patch
+PATCHFILE   ?= $(PATCHNAME)Patch.hpp
+DEPS        += $(BUILD)/$(PATCHFILE)
+else ifdef HEAVY
+# options for Heavy PD compilation
+PATCHNAME   ?= $(HEAVY)
+PATCHCLASS  ?= HeavyPatch
+PATCHFILE   ?= HeavyPatch.hpp
+DEPS        += $(HEAVYDIR)/Heavy_owl.h
+HEAVYFILE   ?= $(HEAVY).pd
+HEAVYNAME   ?= owl
+HEAVYDIR    ?= $(BUILD)/HeavySource
+CPPFLAGS    += -I$(HEAVYDIR)
+CPPFLAGS    += -D__unix__ -DHV_SIMD_NONE
+vpath %.c $(HEAVYDIR)
+else
+# options for C++ compilation
 PATCHNAME   ?= "Template"
 PATCHCLASS  ?= $(PATCHNAME)Patch
 PATCHFILE   ?= $(PATCHNAME)Patch.hpp
+endif
+
 PATCHIN     ?= 2
 PATCHOUT    ?= 2
 SLOT        ?= 0
@@ -31,7 +55,7 @@ CPPFLAGS += -fpie
 CPPFLAGS += -fdata-sections 
 CPPFLAGS += -ffunction-sections
 # CPPFLAGS += -munaligned-access
-CPPFLAGS +=  -mno-unaligned-access
+CPPFLAGS += -mno-unaligned-access
 # CPPFLAGS += -mlong-calls
 
 # CPPFLAGS += -mpic-data-is-text-relative
@@ -78,14 +102,6 @@ vpath %.c $(PATCHSOURCE)
 vpath %.s $(PATCHSOURCE)
 vpath %.c Libraries/syscalls
 
-# Heavy
-HEAVYFILE ?= $(PATCHNAME).pd
-HEAVYNAME  = owl
-HEAVYDIR   = $(BUILD)/HeavySource
-CPPFLAGS    += -I$(HEAVYDIR)
-CPPFLAGS    += -D__unix__ -DHV_SIMD_NONE
-vpath %.c $(HEAVYDIR)
-
 # emscripten
 EMCC       = emcc
 EMCCFLAGS ?= -fno-rtti -fno-exceptions # -std=c++11 
@@ -111,7 +127,8 @@ all: patch
 include $(BUILDROOT)/libs.mk
 include $(BUILDROOT)/common.mk
 
-.PHONY: .FORCE clean realclean run store faust heavy online docs
+.PHONY: .FORCE clean realclean run store online docs
+
 .FORCE:
 	@echo Building patch $(PATCHNAME)
 
@@ -121,14 +138,14 @@ $(BUILD)/patch.cpp: .FORCE
 $(BUILD)/patch.h: .FORCE
 	@echo "#include \"$(PATCHFILE)\"" > $(BUILD)/patch.h
 
-$(BUILD)/PatchProgram.o: $(SOURCE)/PatchProgram.cpp $(BUILD)/patch.h $(BUILD)/patch.cpp
-	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SOURCE)/PatchProgram.cpp -o $@
-	@$(CXX) -MM -MT"$@" $(CPPFLAGS) $(CXXFLAGS) $(SOURCE)/PatchProgram.cpp > $(@:.o=.d)
-
 $(BUILD)/startup.o: .FORCE
 	@echo '.string "'$(PATCHNAME)'"' > $(BUILD)/progname.s
 	@$(CC) -c $(CPPFLAGS) $(CFLAGS) $(SOURCE)/startup.s -o $@
 
+$(BUILD)/PatchProgram.o: $(SOURCE)/PatchProgram.cpp $(DEPS)
+	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SOURCE)/PatchProgram.cpp -o $@
+	@$(CXX) -MM -MT"$@" $(CPPFLAGS) $(CXXFLAGS) $(SOURCE)/PatchProgram.cpp > $(@:.o=.d)
+
 $(BUILD)/patch.elf: $(PATCH_OBJS) $(OBJS) $(LDSCRIPT)
 	@$(LD) $(LDFLAGS) -o $@ $(PATCH_OBJS) $(OBJS) $(LDLIBS)
 
@@ -142,7 +159,7 @@ $(BUILD)/%.syx: $(BUILD)/%.bin
 	@$(FIRMWARESENDER) -q -in $< -save $@
 
 $(BUILD)/%Patch.hpp: $(PATCHSOURCE)/%.dsp
-	@cd $(BUILD) && faust2owl ../$<
+	@cd $(BUILD) && faust2owl $<
 
 size: $(BUILD)/patch.elf $(BUILD)/patch.bin
 	@$(SIZE) $(BUILD)/patch.elf
@@ -165,25 +182,21 @@ online:
 	@echo "$(ONLINE_INCLUDES)" > $(BUILD)/patch.h
 	@echo "$(ONLINE_REGISTER)" > $(BUILD)/patch.cpp
 	@echo '.string "OnlineCompiler"' > $(BUILD)/progname.s
-	@make $(BUILD)/patch.syx
+	@$(MAKE) $(BUILD)/patch.syx
 	@cp $(BUILD)/patch.syx $(BUILD)/online.syx
 
-web: $(EMCC_SRC) $(BUILD)/patch.h $(BUILD)/patch.cpp
+web: $(EMCC_SRC) $(DEPS)
 	@$(EMCC) $(EMCCFLAGS) $(EMCC_SRC) -o $(BUILD)/patch.js
 
 $(HEAVYDIR)/_main.pd: $(PATCHSOURCE)/$(HEAVYFILE)
 	@mkdir -p $(BUILD)/HeavySource
 	@cp -f $(PATCHSOURCE)/*.pd $(BUILD)/HeavySource
 	@cp -f $< $@
 
-$(HEAVYDIR)/Heavy_owl.h: $(BUILD)/HeavySource/_main.pd
+$(HEAVYDIR)/Heavy_owl.h: $(HEAVYDIR)/_main.pd
 	@python ./Tools/Heavy/uploader.py $(BUILD)/HeavySource -g c -n $(HEAVYNAME) -o $(HEAVYDIR)
 
 heavy: $(HEAVYDIR)/Heavy_owl.h
 	@$(eval HEAVY_SRC = $(wildcard $(HEAVYDIR)/*.c) )
-	@$(eval PATCH_OBJS += $(addprefix $(BUILD)/, $(notdir $(HEAVY_SRC:.c=.o))) )
-	@$(eval PATCHCLASS ?= HeavyPatch)
-	@$(eval PATCHFILE ?= HeavyPatch.hpp)
+	@$(eval PATCH_OBJS += $(addprefix $(HEAVYDIR)/, $(notdir $(HEAVY_SRC:.c=.o))))
 	@make $(PATCH_OBJS)
-
-faust: $(BUILD)/$(PATCHFILE)

README.md

@@ -43,7 +43,7 @@ Then open `WebSource/patch.html`
 ## Building FAUST patches
 To compile and run a FAUST patch
 * copy .dsp file and dependencies into `PatchSource`, e.g. `LowShelf.dsp`
-* `make PATCHNAME=LowShelf faust run`
+* `make FAUST=LowShelf run`
 
 Note: assign OWL parameters with slider metadata: `[OWL:PARAMETER_A]`, `[OWL:PARAMETER_B]` et c. For example:
 ```gain = vslider("gain[OWL:PARAMETER_C]", 1,0,1,0.1);```
@@ -59,7 +59,7 @@ To compile and run a PD patch, with C code generated by Enzien Audio:
 Or, using the Heavy uploader (recommended):
 * ensure you have a Heavy project called `owl`
 * put your PD patch file (e.g. `Foo.pd`) into `PatchSource`
-* `make HEAVYFILE=Foo.pd heavy run`
+* `make HEAVY=Foo heavy run`
 * enter username and credentials when prompted (first time only)
 
 Note: assign OWL parameters with PD receivers called `Channel-A`, `Channel-B`, et c.

Source/MemoryBuffer.hpp

@@ -13,9 +13,6 @@ class MemoryBuffer : public AudioBuffer {
   void clear(){
     memset(buffer, 0, size*channels*sizeof(float));
   }
-  // float* getSamples(int channel){
-  //   return buffer+channel*size;
-  // }
   FloatArray getSamples(int channel){
     return FloatArray(buffer+channel*size, size);
   }
@@ -30,13 +27,13 @@ class MemoryBuffer : public AudioBuffer {
 class ManagedMemoryBuffer : public MemoryBuffer {
 public:
   ManagedMemoryBuffer(int ch, int sz) :
-    MemoryBuffer((float*)malloc(ch*sz*sizeof(float)), ch, sz) {
+    MemoryBuffer(new float[ch*sz], ch, sz) {
     if(buffer == NULL){
       channels = 0;
       size = 0;
     }
   }
   ~ManagedMemoryBuffer(){
-    free(buffer);
+    delete buffer;
   }
 };

Source/PatchProcessor.cpp

@@ -1,5 +1,4 @@
 #include "PatchProcessor.h"
-#include "PatchRegistry.h"
 #include "MemoryBuffer.hpp"
 #include "device.h"
 #include <string.h>
@@ -42,20 +41,28 @@ float PatchProcessor::getParameterValue(PatchParameterId pid){
     return 0.0f;
 }
 
+#define SMOOTH_HYSTERESIS
+#define SMOOTH_FACTOR 3
 void PatchProcessor::setParameterValues(uint16_t *params){
   /* Implements an exponential moving average (leaky integrator) to smooth ADC values
    * y(n) = (1-alpha)*y(n-1) + alpha*y(n)
    * with alpha=0.5, fs=48k, bs=128, then w0 ~= 18hz
    */
   if(getProgramVector()->hardware_version == OWL_MODULAR_HARDWARE){
     for(int i=0; i<NOF_ADC_VALUES; ++i)
-      if(abs(params[i]-parameterValues[i]) > 8)
+#ifdef SMOOTH_HYSTERESIS
+      if(abs(params[i]-parameterValues[i]) > 7)
+#endif
 	// invert parameter values for OWL Modular
-	parameterValues[i] = (parameterValues[i] + 0x1000 - params[i]) >> 1;
+	parameterValues[i] = (parameterValues[i]*SMOOTH_FACTOR + 0x1000 - params[i])/(SMOOTH_FACTOR+1);
   }else{
     for(int i=0; i<NOF_ADC_VALUES; ++i)
-      if(abs(params[i]-parameterValues[i]) > 16)
+#ifdef SMOOTH_HYSTERESIS
+      if(abs(params[i]-parameterValues[i]) > 7)
+#endif
 	// 16 = half a midi step (4096/128=32)  
-	parameterValues[i] = (parameterValues[i] + params[i]) >> 1;
+	parameterValues[i] = (parameterValues[i]*SMOOTH_FACTOR + params[i])/(SMOOTH_FACTOR+1);
   }
+  // for(int i=NOF_ADC_VALUES; i<NOF_PARAMETERS; ++i)
+  //   // todo!
 }