<SamplePlayer/> shouldn't generate and <WebMidi/> shouldn't send out-…

…of-bounds note_on velocities
sul-cidr · Oct 15, 2021 · 959a3d0 · 959a3d0
1 parent bfa7b92
commit 959a3d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/components/SamplePlayer.svelte b/src/components/SamplePlayer.svelte
@@ -183,18 +183,20 @@
         }
       },
     );
-    const modifiedVelocity =
+    const modifiedVelocity = Math.min(
       baseVelocity *
-      (($softOnOff && SOFT_PEDAL_RATIO) || 1) *
-      (($accentOnOff && ACCENT_BUMP) || 1) *
-      $volumeCoefficient *
-      (noteNumber < HALF_BOUNDARY
-        ? $bassVolumeCoefficient
-        : $trebleVolumeCoefficient);
+        (($softOnOff && SOFT_PEDAL_RATIO) || 1) *
+        (($accentOnOff && ACCENT_BUMP) || 1) *
+        $volumeCoefficient *
+        (noteNumber < HALF_BOUNDARY
+          ? $bassVolumeCoefficient
+          : $trebleVolumeCoefficient),
+      1,
+    );
     if (modifiedVelocity) {
       piano.keyDown({
         midi: noteNumber,
-        velocity: Math.min(modifiedVelocity, 1),
+        velocity: modifiedVelocity,
       });
     }
     if (!fromMidi) {

diff --git a/src/components/WebMidi.svelte b/src/components/WebMidi.svelte
@@ -2,6 +2,7 @@
   import { notify } from "../ui-components/Notification.svelte";
   import { onMount } from "svelte";
   import { webMidiEnabled } from "../stores";
+  import { clamp } from "../lib/utils";
 
   export let startNote;
   export let stopNote;
@@ -20,7 +21,7 @@
   const sendMidiMsg = (msgType, entity, value) => {
     let msg = null;
     if (msgType == "note_on") {
-      msg = [MIDI_NOTE_ON, entity, parseInt(value * 127, 10)];
+      msg = [MIDI_NOTE_ON, entity, parseInt(clamp(0, 1, value) * 127, 10)];
     } else if (msgType == "note_off") {
       msg = [MIDI_NOTE_OFF, entity, value];
     } else if (msgType == "controller") {