Merge with upstream r2.

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

1 files changed, 5 insertions, 10 deletions

diff --git a/src/mdaDX10.h b/src/mdaDX10.h
index 1041e31..2de75a3 100644
--- a/src/mdaDX10.h
+++ b/src/mdaDX10.h
@@ -16,10 +16,6 @@
 class mdaDX10Program
 {
   friend class mdaDX10;
-public:
-  mdaDX10Program() {}
- ~mdaDX10Program() {}
-
 private:
   float param[NPARAMS];
   char  name[24];
@@ -40,7 +36,7 @@ struct VOICE  //voice state
   float cenv; //smoothed env
   float catt; //smoothing
   float cdec; //carrier envelope decay
-  long  note; //remember what note triggered this
+  LvzInt32  note; //remember what note triggered this
 };
 
 
@@ -79,24 +75,23 @@ public:
 
 private:
 	void update();  //my parameter update
-  void noteOn(long note, long velocity);
-  void fillpatch(long p, const char *name,
+  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 p12, float p13, float p14, float p15);
 
-  float param[NPARAMS];
   mdaDX10Program* programs;
   float Fs;
 
   #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
   VOICE voice[NVOICES];
   #define SUSTAIN 128
-  long sustain, activevoices, K;
+  LvzInt32 sustain, activevoices, K;
 
   float tune, rati, ratf, ratio; //modulator ratio
   float catt, cdec, crel;        //carrier envelope