Merge branch 'master' into feature/esfm

src/engine/platform/abstract.cpp

@@ -102,9 +102,9 @@ bool DivDispatch::isVolGlobal() {
   return false;
 }
 
-int DivDispatch::mapVelocity(int ch, unsigned char vel) {
+int DivDispatch::mapVelocity(int ch, float vel) {
   const int volMax=MAX(1,dispatch(DivCommand(DIV_CMD_GET_VOLMAX,MAX(ch,0))));
-  return (vel*volMax)/127;
+  return round(vel*volMax);
 }
 
 int DivDispatch::getPortaFloor(int ch) {

src/engine/platform/ay.cpp

@@ -719,6 +719,10 @@ DivDispatchOscBuffer* DivPlatformAY8910::getOscBuffer(int ch) {
   return oscBuf[ch];
 }
 
+int DivPlatformAY8910::mapVelocity(int ch, float vel) {
+  return round(15.0*pow(vel,0.33));
+}
+
 unsigned char* DivPlatformAY8910::getRegisterPool() {
   return regPool;
 }

src/engine/platform/ay.h

@@ -131,6 +131,7 @@ class DivPlatformAY8910: public DivDispatch {
     int dispatch(DivCommand c);
     void* getChanState(int chan);
     DivDispatchOscBuffer* getOscBuffer(int chan);
+    int mapVelocity(int ch, float vel);
     unsigned char* getRegisterPool();
     int getRegisterPoolSize();
     void flushWrites();

src/engine/platform/ay8930.cpp

@@ -718,6 +718,10 @@ DivDispatchOscBuffer* DivPlatformAY8930::getOscBuffer(int ch) {
   return oscBuf[ch];
 }
 
+int DivPlatformAY8930::mapVelocity(int ch, float vel) {
+  return round(31.0*pow(vel,0.22));
+}
+
 unsigned char* DivPlatformAY8930::getRegisterPool() {
   return regPool;
 }

src/engine/platform/ay8930.h

@@ -132,6 +132,7 @@ class DivPlatformAY8930: public DivDispatch {
     int dispatch(DivCommand c);
     void* getChanState(int chan);
     DivDispatchOscBuffer* getOscBuffer(int chan);
+    int mapVelocity(int ch, float vel);
     unsigned char* getRegisterPool();
     int getRegisterPoolSize();
     void reset();

src/engine/platform/fmsharedbase.h

@@ -121,6 +121,20 @@ class DivPlatformFMBase: public DivDispatch {
         }
       }
     }
+    
+    virtual int mapVelocity(int ch, float vel) {
+      // -0.75dB per step
+      // -6: 64: 8
+      // -12: 32: 16
+      // -18: 16: 24
+      // -24: 8: 32
+      // -30: 4: 40
+      // -36: 2: 48
+      // -42: 1: 56
+      if (vel==0) return 0;
+      if (vel==127) return 127;
+      return CLAMP(round(128.0-(56.0-log2(vel*127.0)*8.0)),0,127);
+    }
 
     friend void putDispatchChan(void*,int,int);
   

src/engine/platform/pce.cpp

@@ -539,6 +539,10 @@ DivDispatchOscBuffer* DivPlatformPCE::getOscBuffer(int ch) {
   return oscBuf[ch];
 }
 
+int DivPlatformPCE::mapVelocity(int ch, float vel) {
+  return round(31.0*pow(vel,0.22));
+}
+
 unsigned char* DivPlatformPCE::getRegisterPool() {
   return regPool;
 }

src/engine/platform/pce.h

@@ -86,6 +86,7 @@ class DivPlatformPCE: public DivDispatch {
     DivChannelModeHints getModeHints(int chan);
     DivSamplePos getSamplePos(int ch);
     DivDispatchOscBuffer* getOscBuffer(int chan);
+    int mapVelocity(int ch, float vel);
     unsigned char* getRegisterPool();
     int getRegisterPoolSize();
     void reset();

src/engine/platform/sms.cpp

@@ -462,6 +462,10 @@ DivDispatchOscBuffer* DivPlatformSMS::getOscBuffer(int ch) {
   return oscBuf[ch];
 }
 
+int DivPlatformSMS::mapVelocity(int ch, float vel) {
+  return round(15.0*pow(vel,0.33));
+}
+
 unsigned char* DivPlatformSMS::getRegisterPool() {
   return regPool;
 }

src/engine/platform/sms.h

@@ -79,6 +79,7 @@ class DivPlatformSMS: public DivDispatch {
     DivMacroInt* getChanMacroInt(int ch);
     unsigned short getPan(int chan);
     DivDispatchOscBuffer* getOscBuffer(int chan);
+    int mapVelocity(int ch, float vel);
     unsigned char* getRegisterPool();
     int getRegisterPoolSize();
     void reset();

src/engine/platform/t6w28.cpp

@@ -308,6 +308,10 @@ DivDispatchOscBuffer* DivPlatformT6W28::getOscBuffer(int ch) {
   return oscBuf[ch];
 }
 
+int DivPlatformT6W28::mapVelocity(int ch, float vel) {
+  return round(15.0*pow(vel,0.33));
+}
+
 unsigned char* DivPlatformT6W28::getRegisterPool() {
   return regPool;
 }

src/engine/platform/t6w28.h

@@ -65,6 +65,7 @@ class DivPlatformT6W28: public DivDispatch {
     DivMacroInt* getChanMacroInt(int ch);
     unsigned short getPan(int chan);
     DivDispatchOscBuffer* getOscBuffer(int chan);
+    int mapVelocity(int ch, float vel);
     unsigned char* getRegisterPool();
     int getRegisterPoolSize();
     void reset();