Merge with upstream r2.

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

1 files changed, 17 insertions, 22 deletions

diff --git a/src/mdaEPiano.h b/src/mdaEPiano.h
index 5e85e5f..7d58a53 100644
--- a/src/mdaEPiano.h
+++ b/src/mdaEPiano.h
@@ -18,10 +18,6 @@
 class mdaEPianoProgram
 {
   friend class mdaEPiano;
-public:
-  mdaEPianoProgram() {}
-	~mdaEPianoProgram() {}
-
 private:
   float param[NPARAMS];
   char  name[24];
@@ -30,11 +26,11 @@ private:
 
 struct VOICE  //voice state
 {
-  long  delta;  //sample playback
-  long  frac;
-  long  pos;
-  long  end;
-  long  loop;
+  LvzInt32  delta;  //sample playback
+  LvzInt32  frac;
+  LvzInt32  pos;
+  LvzInt32  end;
+  LvzInt32  loop;
 
   float env;  //envelope
   float dec;
@@ -45,17 +41,17 @@ struct VOICE  //voice state
 
   float outl;
   float outr;
-  long  note; //remember what note triggered this
+  LvzInt32  note; //remember what note triggered this
 };
 
 
 struct KGRP  //keygroup
 {
-  long  root;  //MIDI root note
-  long  high;  //highest note
-  long  pos;
-  long  end;
-  long  loop;
+  LvzInt32  root;  //MIDI root note
+  LvzInt32  high;  //highest note
+  LvzInt32  pos;
+  LvzInt32  end;
+  LvzInt32  loop;
 };
 
 class mdaEPiano : public AudioEffectX
@@ -90,30 +86,29 @@ public:
 
 	virtual LvzInt32 getNumMidiInputChannels ()  { return 1; }
 
-  long guiUpdate;
+  LvzInt32 guiUpdate;
   void guiGetDisplay(LvzInt32 index, char *label);
 
 private:
 	void update();  //my parameter update
-  void noteOn(long note, long velocity);
-  void fillpatch(long p, const char *name, float p0, float p1, float p2, float p3, float p4,
+  void noteOn(LvzInt32 note, LvzInt32 velocity);
+  void fillpatch(LvzInt32 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 param[NPARAMS];
   mdaEPianoProgram* programs;
   float Fs, iFs;
 
   #define EVENTBUFFER 120
   #define EVENTS_DONE 99999999
-  long notes[EVENTBUFFER + 8];  //list of delta|note|velocity for current block
+  LvzInt32 notes[EVENTBUFFER + 8];  //list of delta|note|velocity for current block
 
   ///global internal variables
   KGRP  kgrp[34];
   VOICE voice[NVOICES];
-  long  activevoices, poly;
+  LvzInt32  activevoices, poly;
   short *waves;
   float width;
-  long  size, sustain;
+  LvzInt32  size, sustain;
   float lfo0, lfo1, dlfo, lmod, rmod;
   float treb, tfrq, tl, tr;
   float tune, fine, random, stretch, overdrive;