start working on ADSR macro mode

src/engine/engine.h

@@ -47,8 +47,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev119"
-#define DIV_ENGINE_VERSION 119
+#define DIV_VERSION "dev120"
+#define DIV_ENGINE_VERSION 120
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02

src/engine/instrument.h

@@ -177,7 +177,7 @@ struct DivInstrumentMacro {
   String name;
   int val[256];
   unsigned int mode;
-  bool open;
+  unsigned char open;
   unsigned char len, delay, speed, loop, rel;
   
   // the following variables are used by the GUI and not saved in the file

src/engine/macroInt.cpp

@@ -21,9 +21,20 @@
 #include "instrument.h"
 #include "engine.h"
 
+#define ADSR_LOW source.val[0]
+#define ADSR_HIGH source.val[1]
+#define ADSR_AR source.val[2]
+#define ADSR_HT source.val[3]
+#define ADSR_DR source.val[4]
+#define ADSR_SL source.val[5]
+#define ADSR_ST source.val[6]
+#define ADSR_SR source.val[7]
+#define ADSR_RR source.val[8]
+
 void DivMacroStruct::prepare(DivInstrumentMacro& source, DivEngine* e) {
   has=had=actualHad=will=true;
   mode=source.mode;
+  type=(source.open>>1)&3;
   linger=(source.name=="vol" && e->song.volMacroLinger);
 }
 
@@ -53,24 +64,70 @@ void DivMacroStruct::doMacro(DivInstrumentMacro& source, bool released, bool tic
   }
   actualHad=has;
   had=actualHad;
+
   if (has) {
-    lastPos=pos;
-    val=source.val[pos++];
-    if (pos>source.rel && !released) {
-      if (source.loop<source.len && source.loop<source.rel) {
-        pos=source.loop;
-      } else {
-        pos--;
+    if (type==0) { // sequence
+      lastPos=pos;
+      val=source.val[pos++];
+      if (pos>source.rel && !released) {
+        if (source.loop<source.len && source.loop<source.rel) {
+          pos=source.loop;
+        } else {
+          pos--;
+        }
+      }
+      if (pos>=source.len) {
+        if (source.loop<source.len && (source.loop>=source.rel || source.rel>=source.len)) {
+          pos=source.loop;
+        } else if (linger) {
+          pos--;
+        } else {
+          has=false;
+        }
       }
     }
-    if (pos>=source.len) {
-      if (source.loop<source.len && (source.loop>=source.rel || source.rel>=source.len)) {
-        pos=source.loop;
-      } else if (linger) {
-        pos--;
-      } else {
-        has=false;
+    if (type==1 || type==3) { // ADSR
+      if (released && lastPos<3) lastPos=3;
+      switch (lastPos) {
+        case 0: // attack
+          pos+=ADSR_AR;
+          if (pos>255) {
+            pos=255;
+            lastPos=1;
+            delay=ADSR_HT;
+          }
+          break;
+        case 1: // decay
+          pos-=ADSR_DR;
+          if (pos<=ADSR_SL) {
+            pos=ADSR_SL;
+            lastPos=2;
+            delay=ADSR_ST;
+          }
+          break;
+        case 2: // sustain
+          pos-=ADSR_SR;
+          if (pos<0) {
+            pos=0;
+            lastPos=4;
+          }
+          break;
+        case 3: // release
+          pos-=ADSR_RR;
+          if (pos<0) {
+            pos=0;
+            lastPos=4;
+          }
+          break;
+        case 4: // end
+          pos=0;
+          if (!linger) has=false;
+          break;
       }
+      val=ADSR_LOW+((pos+(ADSR_HIGH-ADSR_LOW)*pos)>>8);
+    }
+    if (type==2 || type==3) { // LFO
+    
     }
   }
 }

src/engine/macroInt.h

@@ -28,10 +28,10 @@ struct DivMacroStruct {
   int pos, lastPos, delay;
   int val;
   bool has, had, actualHad, finished, will, linger, began;
-  unsigned int mode;
+  unsigned int mode, type;
   void doMacro(DivInstrumentMacro& source, bool released, bool tick);
   void init() {
-    pos=lastPos=mode=delay=0;
+    pos=lastPos=mode=type=delay=0;
     has=had=actualHad=will=false;
     linger=false;
     began=true;
@@ -51,7 +51,8 @@ struct DivMacroStruct {
     will(false),
     linger(false),
     began(true),
-    mode(0) {}
+    mode(0),
+    type(0) {}
 };
 
 class DivMacroInt {