Small fixes.

pull/1/head
Holger Wirtz 8 years ago
parent af19d28a2e
commit 71c81732e4
  1. 47
      src/Makefile
  2. 2
      src/PluginFx.cpp
  3. 2
      src/dexed.cpp

@ -1,11 +1,24 @@
#DEBUG=-DDEBUG
BUNDLE=dexed.lv2 BUNDLE=dexed.lv2
INSTALL_DIR=/home/pi/zynthian/zynthian-plugins/mod-lv2 INSTALL_DIR=/home/pi/zynthian/zynthian-plugins/mod-lv2
TARGET=dexed.so TARGET=dexed.so
OBJ=fm_core.o env.o lfo.o dx7note.o sin.o pitchenv.o fm_op_kernel.o freqlut.o exp2.o EngineMkI.o EngineOpl.o PluginFx.o trace.o OBJ=fm_core.o env.o lfo.o dx7note.o sin.o pitchenv.o fm_op_kernel.o freqlut.o exp2.o EngineMkI.o EngineOpl.o PluginFx.o trace.o
CFLAGS=-fPIC -DPIC $(DEBUG) -std=c++11 -I. -I/usr/local/include/lvtk-2 CFLAGS=-fPIC -DPIC -std=c++11 -I. -I/usr/local/include/lvtk-2
LDFLAGS=-L/usr/local/lib -llvtk_plugin2 LDFLAGS=-L/usr/local/lib -llvtk_plugin2
ifeq ($(ARCH),)
ARCH := $(shell uname -m)
endif
ifneq ($(findstring armv7,$(ARCH)),)
CXXFLAGS += -mfpu=neon -march=armv7-a -marm
endif
ifeq ($(DEBUG), 1)
CXXFLAGS += -DDEBUG $(CFLAGS)
else
CXXFLAGS += -Ofast $(CFLAGS)
endif
all: $(BUNDLE) Makefile all: $(BUNDLE) Makefile
clean: Makefile clean: Makefile
@ -25,49 +38,49 @@ $(BUNDLE): manifest.ttl Dexed.ttl dexed.so
# cp -R modgui $(BUNDLE) # cp -R modgui $(BUNDLE)
dexed.so: $(OBJ) dexed.o dexed.so: $(OBJ) dexed.o
$(CXX) -shared dexed.o $(OBJ) $(LDFLAGS) -o dexed.so $(CXX) $(CXXFLAGS) -shared dexed.o $(OBJ) $(LDFLAGS) -o dexed.so
dexed.o: Makefile dexed.cpp dexed.peg dexed.o: Makefile dexed.cpp dexed.peg
$(CXX) $(CFLAGS) -Wall -c dexed.cpp $(CXX) $(CXXFLAGS) -Wall -c dexed.cpp
trace.o: Makefile trace.c trace.h trace.o: Makefile trace.c trace.h
$(CXX) $(CFLAGS) -Wall -c trace.c $(CXX) $(CXXFLAGS) -Wall -c trace.c
fm_core.o: Makefile msfa/fm_core.cc fm_core.o: Makefile msfa/fm_core.cc
$(CXX) $(CFLAGS) -Wall -c msfa/fm_core.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/fm_core.cc
env.o: Makefile msfa/env.cc env.o: Makefile msfa/env.cc
$(CXX) $(CFLAGS) -Wall -c msfa/env.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/env.cc
lfo.o: Makefile msfa/lfo.cc lfo.o: Makefile msfa/lfo.cc
$(CXX) $(CFLAGS) -Wall -c msfa/lfo.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/lfo.cc
dx7note.o: Makefile msfa/dx7note.cc dx7note.o: Makefile msfa/dx7note.cc
$(CXX) $(CFLAGS) -Wall -c msfa/dx7note.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/dx7note.cc
sin.o: Makefile msfa/sin.cc sin.o: Makefile msfa/sin.cc
$(CXX) $(CFLAGS) -Wall -c msfa/sin.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/sin.cc
pitchenv.o: Makefile msfa/pitchenv.cc pitchenv.o: Makefile msfa/pitchenv.cc
$(CXX) $(CFLAGS) -Wall -c msfa/pitchenv.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/pitchenv.cc
fm_op_kernel.o: Makefile msfa/fm_op_kernel.cc fm_op_kernel.o: Makefile msfa/fm_op_kernel.cc
$(CXX) $(CFLAGS) -Wall -c msfa/fm_op_kernel.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/fm_op_kernel.cc
freqlut.o: Makefile msfa/freqlut.cc freqlut.o: Makefile msfa/freqlut.cc
$(CXX) $(CFLAGS) -Wall -c msfa/freqlut.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/freqlut.cc
exp2.o: Makefile msfa/exp2.cc exp2.o: Makefile msfa/exp2.cc
$(CXX) $(CFLAGS) -Wall -c msfa/exp2.cc $(CXX) $(CXXFLAGS) -Wall -c msfa/exp2.cc
EngineMkI.o: Makefile EngineMkI.cpp EngineMkI.o: Makefile EngineMkI.cpp
$(CXX) $(CFLAGS) -Wall -c EngineMkI.cpp $(CXX) $(CXXFLAGS) -Wall -c EngineMkI.cpp
EngineOpl.o: Makefile EngineOpl.cpp EngineOpl.o: Makefile EngineOpl.cpp
$(CXX) $(CFLAGS) -Wall -c EngineOpl.cpp $(CXX) $(CXXFLAGS) -Wall -c EngineOpl.cpp
PluginFx.o: Makefile PluginFx.cpp PluginFx.o: Makefile PluginFx.cpp
$(CXX) $(CFLAGS) -Wall -c PluginFx.cpp $(CXX) $(CXXFLAGS) -Wall -c PluginFx.cpp
dexed.peg: Dexed.ttl dexed.peg: Dexed.ttl
lv2peg Dexed.ttl dexed.peg lv2peg Dexed.ttl dexed.peg

@ -158,7 +158,7 @@ void PluginFx::process(float *work, int sampleSize) {
float y2 = tptpc(s2,y1,g); float y2 = tptpc(s2,y1,g);
float y3 = tptpc(s3,y2,g); float y3 = tptpc(s3,y2,g);
float y4 = tptpc(s4,y3,g); float y4 = tptpc(s4,y3,g);
float mc; float mc=0.0;
switch(mmch) { switch(mmch) {
case 0: case 0:

@ -588,6 +588,8 @@ void Dexed::onParam(int param_num,int param_val)
{ {
if(param_val!=data[param_num]) if(param_val!=data[param_num])
{ {
if(param_num==144)
panic();
refreshVoice=true; refreshVoice=true;
data[param_num]=param_val; data[param_num]=param_val;
} }

Loading…
Cancel
Save