Trying to fix problems...

pull/1/head
Holger Wirtz 8 years ago
parent b7d73f6a92
commit ef3f9e1c61
  1. 2
      src/Dexed.ttl
  2. 7
      src/Makefile
  3. 5
      src/dexed.cpp
  4. 2
      src/dexed_ttl.h
  5. 3
      src/msfa/dx7note.cc
  6. 3
      src/msfa/dx7note.h
  7. 14
      src/trace.c

@ -59,7 +59,7 @@
lv2:portProperty pprops:logarithmic ; lv2:portProperty pprops:logarithmic ;
lv2:default 1.000000 ; lv2:default 1.000000 ;
lv2:minimum 0.1 ; lv2:minimum 0.1 ;
lv2:maximum 2.0 ; lv2:maximum 10.0 ;
] , ] ,
[ [
a lv2:InputPort, lv2:ControlPort ; a lv2:InputPort, lv2:ControlPort ;

@ -40,9 +40,14 @@ ifneq ($(findstring arm,$(ARCH)),)
endif endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
ifeq ($(FILETRACE), 1)
CXXFLAGS += -DDEBUG -DFILETRACE $(CFLAGS) -D PATCH_DEBUG
else
CXXFLAGS += -DDEBUG $(CFLAGS) CXXFLAGS += -DDEBUG $(CFLAGS)
endif
else else
CXXFLAGS += -Ofast $(CFLAGS) $(CPU) $(FPU) #CXXFLAGS += -Ofast $(CFLAGS) $(CPU) $(FPU)
CXXFLAGS += $(CFLAGS) -O3 -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -mvectorize-with-neon-quad
endif endif
all: $(BUNDLE) Makefile all: $(BUNDLE) Makefile

@ -64,7 +64,8 @@ Dexed::Dexed(double rate) : lvtk::Synth<DexedVoice, Dexed>(p_n_ports, p_midi_in)
engineType=0xff; engineType=0xff;
setEngineType(DEXED_ENGINE_MARKI); setEngineType(DEXED_ENGINE_MARKI);
//add_voices(new DexedVoice(rate)); add_voices(new DexedVoice(rate));
add_audio_outputs(p_audio_out); add_audio_outputs(p_audio_out);
TRACE("Bye"); TRACE("Bye");
@ -315,6 +316,8 @@ void Dexed::run (uint32_t sample_count)
float* output = p(p_audio_out); float* output = p(p_audio_out);
uint32_t last_frame = 0, num_this_time = 0; uint32_t last_frame = 0, num_this_time = 0;
Plugin::run(sample_count);
if(++_param_counter==16) if(++_param_counter==16)
{ {
set_params(); // pre_process: copy actual voice params set_params(); // pre_process: copy actual voice params

@ -179,7 +179,7 @@ static const peg_data_t p_ports[] = {
{ -3.40282e+38, 3.40282e+38, -3.40282e+38, 0, 0, 0 }, { -3.40282e+38, 3.40282e+38, -3.40282e+38, 0, 0, 0 },
{ 0, 1, 1, 0, 0, 0 }, { 0, 1, 1, 0, 0, 0 },
{ 0, 1, 0, 0, 0, 0 }, { 0, 1, 0, 0, 0, 0 },
{ 0.1, 2, 1, 0, 0, 1 }, { 0.1, 10, 1, 0, 0, 1 },
{ 0, 2, 1, 0, 1, 0 }, { 0, 2, 1, 0, 1, 0 },
{ 0, 1, 0, 1, 1, 0 }, { 0, 1, 0, 1, 1, 0 },
{ 1, 32, 5, 0, 1, 0 }, { 1, 32, 5, 0, 1, 0 },

@ -136,7 +136,8 @@ Dx7Note::Dx7Note() {
} }
} }
void Dx7Note::init(const uint8_t patch[156], int midinote, int velocity, int fb_depth) { //void Dx7Note::init(const uint8_t patch[156], int midinote, int velocity, int fb_depth) {
void Dx7Note::init(uint8_t patch[156], int midinote, int velocity, int fb_depth) {
int rates[4]; int rates[4];
int levels[4]; int levels[4];
for (int op = 0; op < 6; op++) { for (int op = 0; op < 6; op++) {

@ -36,7 +36,8 @@ struct VoiceStatus {
class Dx7Note { class Dx7Note {
public: public:
Dx7Note(); Dx7Note();
void init(const uint8_t patch[156], int midinote, int velocity, int fb_depth); //void init(const uint8_t patch[156], int midinote, int velocity, int fb_depth);
void init(uint8_t patch[156], int midinote, int velocity, int fb_depth);
// Note: this _adds_ to the buffer. Interesting question whether it's // Note: this _adds_ to the buffer. Interesting question whether it's
// worth it... // worth it...

@ -2,11 +2,21 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
void _trace(const char *source, const char *fmt, ...) { void _trace(const char *source, const char *fmt, ...) {
char output[4096]; char output[1024];
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf(output, 4095, fmt, argptr); vsnprintf(output, 1023, fmt, argptr);
va_end(argptr); va_end(argptr);
#ifdef FILETRACE
FILE *fp;
fp=fopen("/tmp/dexed.log", "a");
fputs(source, fp);
fputs(": ", fp);
fputs(output, fp);
fputs("\n", fp);
fclose(fp);
#else
printf("%s: %s\n",source,output); printf("%s: %s\n",source,output);
#endif
} }
#endif #endif

Loading…
Cancel
Save