fix vel2midi, freq2midi, etc.

heuermh · Sep 2, 2012 · 15ed0a0 · 15ed0a0
1 parent e7c6d3f
commit 15ed0a0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/Animoog.ck b/Animoog.ck
@@ -626,12 +626,12 @@ public class Animoog
 
     fun float midi2freq(int n)
     {
-        return 0.0;
+        return Std.mtof(n);
     }
 
     fun float midi2vel(int v)
     {
-        return 0.0;
+        return (v / 127.0);
     }
 
     fun int toCC(float value)

diff --git a/AnimoogMidi.ck b/AnimoogMidi.ck
@@ -747,12 +747,20 @@ public class AnimoogMidi
 
     fun int freq2midi(float f)
     {
-        return 0;
+        return Std.ftom(f) $ int;
     }
 
     fun int vel2midi(float v)
     {
-        return 0;
+        if (v < 0.0)
+        {
+            return 0;
+        }
+        if (v > 1.0)
+        {
+            return 127;
+        }
+        return (v * 127.0) $ int;
     }
 
     fun int toCC(float value)

diff --git a/MeeBlip.ck b/MeeBlip.ck
@@ -431,12 +431,12 @@ public class MeeBlip
 
     fun float midi2freq(int n)
     {
-        return 0.0;
+        return Std.mtof(n);
     }
 
     fun float midi2vel(int v)
     {
-        return 0.0;
+        return (v / 127.0);
     }
 
     fun int toCC(float value)

diff --git a/MeeBlipMidi.ck b/MeeBlipMidi.ck
@@ -530,12 +530,20 @@ http://meeblip.com/use-one/micro-kit-assembly/
 
     fun int freq2midi(float f)
     {
-        return 0;
+        return Std.ftom(f) $ int;
     }
 
     fun int vel2midi(float v)
     {
-        return 0;
+        if (v < 0.0)
+        {
+            return 0;
+        }
+        if (v > 1.0)
+        {
+            return 127;
+        }
+        return (v * 127.0) $ int;
     }
 
     fun int toCC(float value)