# HG changeset patch # User Vesa Norilo # Date 1643010851 -7200 # Mon Jan 24 09:54:11 2022 +0200 # Branch release # Node ID 4e0788e9877227cce3f3d7027afc3f136a91ee06 # Parent 3ba942734a1bc0da73f6bda17fb1e8b32096e16b midi fixes diff --git a/src/js/KronosClass.js b/src/js/KronosClass.js --- a/src/js/KronosClass.js +++ b/src/js/KronosClass.js @@ -298,7 +298,6 @@ if (setter || ticker) { if (type === "%i") { inst["SetParam"][method] = (function(data) { - console.log(method, data); this.InBuf.I32(1)[0] = data; setter && setter(this.InBuf.ptr); ticker && ticker(this.InstancePtr, this.OutBuf.ptr, 1); diff --git a/src/veneer/midi.cljs b/src/veneer/midi.cljs --- a/src/veneer/midi.cljs +++ b/src/veneer/midi.cljs @@ -31,7 +31,7 @@ (aset input "onmidimessage" #(recv (.-data %)))) (defn activate [] - (if (.-requestMIDIAccess js/navigator) + (when (.-requestMIDIAccess js/navigator) (println "[WebMIDI] Supported") (.. js/navigator requestMIDIAccess @@ -47,4 +47,5 @@ (subscribe (.-port e))))) (.. -inputs (forEach subscribe)))) - js/console.warning)))) \ No newline at end of file + (fn [error] + (println "[WebMIDI] Permission refused: " error)))))) \ No newline at end of file diff --git a/src/veneer/patcher/expr.cljs b/src/veneer/patcher/expr.cljs --- a/src/veneer/patcher/expr.cljs +++ b/src/veneer/patcher/expr.cljs @@ -119,7 +119,7 @@ (let [st (bit-and 0xff (bit-shift-right word 16)) a (bit-and 0xff (bit-shift-right word 8)) b (bit-and 0xff word) - bar (get bar-graph (js/Math.round (/ b (/ 127 9))))] + bar (get bar-graph (js/Math.round (/ b (/ 127 8))))] (into [:span.expression {:style @@ -131,9 +131,11 @@ ["⮟" (midi-note a) " " bar] ["⮝" (midi-note a) " "]) 0xa0 ["☟" (midi-note a) " " bar] - 0xb0 ["🎚" a " " bar] + 0xb0 ["cc" a " " bar] 0xc0 ["☟ " a] - 0xd0 ["🕹" (- (+ a (bit-shift-left b 7)) 0x2000)] + 0xe0 ["🕹" (.padStart + (str (- (+ a (bit-shift-left b 7)) 0x2000)) + 5)] ;default [(.toString st 16) a b]))))