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/mdaSpecMeter.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/mdaSpecMeter.h') diff --git a/src/mdaSpecMeter.h b/src/mdaSpecMeter.h index 90111c4..e99137c 100644 --- a/src/mdaSpecMeter.h +++ b/src/mdaSpecMeter.h @@ -9,10 +9,15 @@ #include +#define NPROGS 4 //can hide decay settings in programs! fast...slow...peak hold #define SILENCE 0.00000001f enum { - _PARAM0, // gain + _PARAM0, //peak decay + _PARAM1, //RMS speed + _PARAM2, //spectrum speed + _PARAM3, //peak reset? + NPARAMS }; @@ -23,8 +28,6 @@ class mdaSpecMeterProgram friend class mdaSpecMeter; public: mdaSpecMeterProgram(); - ~mdaSpecMeterProgram() {} - private: float param[NPARAMS]; char name[24]; @@ -42,6 +45,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); @@ -56,17 +60,16 @@ public: virtual LvzInt32 getVendorVersion() { return 1000; } //accessible from editor - long counter; + LvzInt32 counter; float Lpeak, Lhold, Lmin, Lrms, Rpeak, Rhold, Rmin, Rrms, Corr; // #11 #12 float band[2][16]; //8 16 31 64 125 250 500 1k 2k 4k 8k 16k 32k - + private: mdaSpecMeterProgram *programs; - float param[NPARAMS]; float iK, lpeak, lmin, lrms, rpeak, rmin, rrms, corr, den; float lpp[6][16], rpp[6][16]; - long topband, K, kmax; + LvzInt32 topband, K, kmax; float gain; }; -- cgit v1.2.1