From adacb33bf4eadcd49a744177bf3f059e7b2f2f52 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 22 Feb 2010 21:24:34 +0000 Subject: Merge with upstream r2. git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2471 a436a847-0d15-0410-975c-d299462d15a1 --- src/mdaLeslie.h | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'src/mdaLeslie.h') diff --git a/src/mdaLeslie.h b/src/mdaLeslie.h index c6d3675..c4c21cd 100644 --- a/src/mdaLeslie.h +++ b/src/mdaLeslie.h @@ -3,16 +3,16 @@ #include "audioeffectx.h" +#define NPARAMS 9 //number of parameters +#define NPROGS 3 //number of programs + class mdaLeslieProgram { public: mdaLeslieProgram(); - ~mdaLeslieProgram() {} - private: friend class mdaLeslie; - float fParam1, fParam3, fParam4, fParam5, fParam6; - float fParam7, fParam9, fParam2, fParam8; + float param[NPARAMS]; char name[24]; }; @@ -27,6 +27,7 @@ public: virtual void setProgram(LvzInt32 program); virtual void setProgramName(char *name); virtual void getProgramName(char *name); + virtual bool getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name); virtual void setParameter(LvzInt32 index, float value); virtual float getParameter(LvzInt32 index); virtual void getParameterLabel(LvzInt32 index, char *label); @@ -40,16 +41,7 @@ public: virtual LvzInt32 getVendorVersion() { return 1000; } protected: - float fParam1; - float fParam3; - float fParam4; - float fParam5; - float fParam6; - float fParam7; - float fParam9; - float fParam2; - float fParam8; - + void update(); mdaLeslieProgram *programs; float filo; //crossover filter coeff @@ -58,11 +50,9 @@ protected: float hspd, hset, hmom, hphi, hwid, hlev, hdep; float lspd, lset, lmom, lphi, lwid, llev, gain; float *hbuf; //HF delay buffer - long size, hpos; //buffer length & pointer + LvzInt32 size, hpos; //buffer length & pointer float chp, dchp, clp, dclp, shp, dshp, slp, dslp; - - char programName[32]; }; #endif -- cgit v1.2.1