Merge with upstream r2.

git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2471 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mdaVocoder.h b/src/mdaVocoder.h
index 5aa36fd..71e29cc 100644
--- a/src/mdaVocoder.h
+++ b/src/mdaVocoder.h
@@ -15,8 +15,6 @@ class mdaVocoderProgram
 {

 public:

   mdaVocoderProgram();

-  ~mdaVocoderProgram() {}

-

 private:

   friend class mdaVocoder;

   float param[NPARAMS];

@@ -35,6 +33,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);

@@ -49,17 +48,15 @@ public:
 	virtual LvzInt32 getVendorVersion() { return 1000; }

   

 protected:

-  float param[NPARAMS];

-  char programName[32];

   mdaVocoderProgram *programs;

 

   ///global internal variables

-  long  swap;       //input channel swap

+  LvzInt32  swap;       //input channel swap

   float gain;       //output level

   float thru, high; //hf thru              

   float kout; //downsampled output

-  long  kval; //downsample counter

-  long  nbnd; //number of bands

+  LvzInt32  kval; //downsample counter

+  LvzInt32  nbnd; //number of bands

   

   //filter coeffs and buffers - seems it's faster to leave this global than make local copy 

   float f[NBANDS][13]; //[0-8][0 1 2 | 0 1 2 3 | 0 1 2 3 | val rate]