Removed all unnecessary code from mdaEPiano for multiple programs.

dev
Holger Wirtz 6 years ago
parent 054711036a
commit 1f51969bdc
  1. 11
      mdaEPiano.cpp
  2. 16
      mdaEPiano.h

@ -35,6 +35,7 @@ mdaEPiano::mdaEPiano() // mdaEPiano::mdaEPiano(audioMasterCallback audioMaster)
{ {
Fs = SAMPLE_RATE; iFs = 1.0f / Fs; //just in case... Fs = SAMPLE_RATE; iFs = 1.0f / Fs; //just in case...
/*
programs = new mdaEPianoProgram[NPROGS]; programs = new mdaEPianoProgram[NPROGS];
if (programs) if (programs)
{ {
@ -50,6 +51,7 @@ mdaEPiano::mdaEPiano() // mdaEPiano::mdaEPiano(audioMasterCallback audioMaster)
fillpatch(i++, "(default)", 0.500f, 0.500f, 0.500f, 0.500f, 0.500f, 0.650f, 0.250f, 0.500f, 1.0f, 0.500f, 0.146f, 0.000f); fillpatch(i++, "(default)", 0.500f, 0.500f, 0.500f, 0.500f, 0.500f, 0.650f, 0.250f, 0.500f, 1.0f, 0.500f, 0.146f, 0.000f);
setProgram(0); setProgram(0);
} }
*/
waves = (short*)epianoDataXfade; waves = (short*)epianoDataXfade;
@ -118,7 +120,7 @@ void mdaEPiano::reset_voices(void) // reset all voices
tl = tr = lfo0 = dlfo = 0.0f; tl = tr = lfo0 = dlfo = 0.0f;
lfo1 = 1.0f; lfo1 = 1.0f;
guiUpdate = 0; //guiUpdate = 0;
vol = VOLUME; vol = VOLUME;
update(); update();
@ -162,13 +164,13 @@ mdaEPiano::~mdaEPiano () //destroy any buffers...
if (programs) delete [] programs; if (programs) delete [] programs;
} }
/*
void mdaEPiano::setProgram(int32_t program) void mdaEPiano::setProgram(int32_t program)
{ {
curProgram = program; curProgram = program;
update(); update();
} }
*/
void mdaEPiano::setParameter(int32_t index, float value) void mdaEPiano::setParameter(int32_t index, float value)
{ {
@ -176,7 +178,7 @@ void mdaEPiano::setParameter(int32_t index, float value)
update(); update();
} }
/*
void mdaEPiano::fillpatch(int32_t p, char *name, float p0, float p1, float p2, float p3, float p4, void mdaEPiano::fillpatch(int32_t p, char *name, float p0, float p1, float p2, float p3, float p4,
float p5, float p6, float p7, float p8, float p9, float p10, float p11) float p5, float p6, float p7, float p8, float p9, float p10, float p11)
{ {
@ -192,6 +194,7 @@ void mdaEPiano::fillpatch(int32_t p, char *name, float p0, float p1, float p2, f
float mdaEPiano::getParameter(int32_t index) { float mdaEPiano::getParameter(int32_t index) {
return programs[curProgram].param[index]; return programs[curProgram].param[index];
} }
*/
void mdaEPiano::process(int16_t* outputs_r, int16_t* outputs_l) void mdaEPiano::process(int16_t* outputs_r, int16_t* outputs_l)
{ {

@ -28,7 +28,7 @@
#include "config.h" #include "config.h"
#define NPARAMS 12 //number of parameters #define NPARAMS 12 //number of parameters
#define NPROGS 8 //number of programs #define NPROGS 1 //number of programs
#define NOUTS 2 //number of outputs #define NOUTS 2 //number of outputs
#define SUSTAIN 128 #define SUSTAIN 128
#define SILENCE 0.0001f //voice choking #define SILENCE 0.0001f //voice choking
@ -83,19 +83,19 @@ class mdaEPiano
virtual void process(int16_t *outputs_r, int16_t *outputs_l); virtual void process(int16_t *outputs_r, int16_t *outputs_l);
void noteOn(int32_t note, int32_t velocity); void noteOn(int32_t note, int32_t velocity);
virtual bool processMidiController(uint8_t data1, uint8_t data2); virtual bool processMidiController(uint8_t data1, uint8_t data2);
virtual void setProgram(int32_t program); //virtual void setProgram(int32_t program);
virtual void setParameter(int32_t index, float value); virtual void setParameter(int32_t index, float value);
virtual float getParameter(int32_t index); //virtual float getParameter(int32_t index);
virtual void resume(); virtual void resume();
void reset_voices(void); void reset_voices(void);
int32_t guiUpdate; //int32_t guiUpdate;
void guiGetDisplay(int32_t index, char *label); //void guiGetDisplay(int32_t index, char *label);
private: private:
void update(); //my parameter update void update(); //my parameter update
void fillpatch(int32_t p, char *name, float p0, float p1, float p2, float p3, float p4, /* void fillpatch(int32_t p, char *name, float p0, float p1, float p2, float p3, float p4,
float p5, float p6, float p7, float p8, float p9, float p10, float p11); float p5, float p6, float p7, float p8, float p9, float p10, float p11); */
mdaEPianoProgram* programs; mdaEPianoProgram* programs;
float Fs, iFs; float Fs, iFs;
@ -112,7 +112,7 @@ class mdaEPiano
float tune, fine, random, stretch, overdrive; float tune, fine, random, stretch, overdrive;
float muff, muffvel, sizevel, velsens, volume, modwhl; float muff, muffvel, sizevel, velsens, volume, modwhl;
float vol; float vol;
uint8_t curProgram; const uint8_t curProgram = 0;
}; };
#endif #endif

Loading…
Cancel
Save