Merge pull request #654 from shorepine/patch_event_gen

patch event gen

Author: bwhitman

amy

@@ -9,65 +9,64 @@ window.AMY_EVENT_LAYOUT = {
     "NUM_COMBO_COEFS": 9
   },
   "offsets": {
-    "algo_source": 264,
-    "algorithm": 246,
+    "algo_source": 260,
+    "algorithm": 242,
     "amp_coefs": 20,
-    "bp0": 340,
-    "bp1": 596,
-    "bp_is_set": 260,
-    "chained_osc": 242,
-    "chorus_depth": 920,
-    "chorus_level": 908,
-    "chorus_lfo_freq": 916,
-    "chorus_max_delay": 912,
-    "detune": 212,
+    "bp0": 336,
+    "bp1": 592,
+    "bp_is_set": 256,
+    "chained_osc": 238,
+    "chorus_depth": 916,
+    "chorus_level": 904,
+    "chorus_lfo_freq": 912,
+    "chorus_max_delay": 908,
     "duty_coefs": 128,
-    "echo_delay_ms": 892,
-    "echo_feedback": 900,
-    "echo_filter_coef": 904,
-    "echo_level": 888,
-    "echo_max_delay_ms": 896,
-    "eg_type": 852,
-    "eq_h": 256,
-    "eq_l": 248,
-    "eq_m": 252,
+    "echo_delay_ms": 888,
+    "echo_feedback": 896,
+    "echo_filter_coef": 900,
+    "echo_level": 884,
+    "echo_max_delay_ms": 892,
+    "eg_type": 848,
+    "eq_h": 252,
+    "eq_l": 244,
+    "eq_m": 248,
     "feedback": 200,
     "filter_freq_coefs": 92,
-    "filter_type": 247,
+    "filter_type": 243,
     "freq_coefs": 56,
-    "grab_midi_notes": 863,
-    "latency_ms": 228,
+    "grab_midi_notes": 859,
+    "latency_ms": 224,
     "midi_note": 12,
-    "mod_source": 244,
-    "note_source": 881,
-    "num_voices": 866,
+    "mod_source": 240,
+    "note_source": 877,
+    "num_voices": 862,
     "osc": 4,
     "pan_coefs": 164,
     "patch_number": 16,
-    "pedal": 864,
+    "pedal": 860,
     "phase": 208,
-    "pitch_bend": 220,
-    "portamento_ms": 240,
+    "pitch_bend": 216,
+    "portamento_ms": 236,
     "preset": 8,
-    "ratio": 232,
-    "reset_osc": 884,
-    "resonance": 236,
-    "reverb_damping": 932,
-    "reverb_level": 924,
-    "reverb_liveness": 928,
-    "reverb_xover_hz": 936,
-    "sequence": 868,
-    "status": 880,
-    "synth": 854,
-    "synth_delay_ms": 860,
-    "synth_flags": 856,
-    "tempo": 224,
+    "ratio": 228,
+    "reset_osc": 880,
+    "resonance": 232,
+    "reverb_damping": 928,
+    "reverb_level": 920,
+    "reverb_liveness": 924,
+    "reverb_xover_hz": 932,
+    "sequence": 864,
+    "status": 876,
+    "synth": 850,
+    "synth_delay_ms": 856,
+    "synth_flags": 852,
+    "tempo": 220,
     "time": 0,
-    "to_synth": 862,
+    "to_synth": 858,
     "velocity": 204,
-    "voices": 276,
-    "volume": 216,
+    "voices": 272,
+    "volume": 212,
     "wave": 6
   },
-  "size": 940
+  "size": 936
 };

tulip/amyboardweb/static/amy_event_layout.generated.js

@@ -422,7 +422,6 @@ function set_knobs_from_patch_number(patch_number) {
   // if this is a memory patch, load it. if not, load the amyboard base patch
   if(patch_number >= 1024 && patch_number < 1024+32) {
     amy_add_log_message("i"+window.current_synth+"iv6K"+patch_number);
-    return; // we can't set the knobs from memory patches yet.
   } else {
     amy_add_log_message("i"+window.current_synth+"iv6K257");  // The amyboardsynth base patch - 3 oscs, bp2 for filter.
   }

tulip/amyboardweb/static/amy_parameters.js

@@ -31,8 +31,6 @@ var amy_module = null;
 var pendingPatchKnobIndex = null;
 var patchKnobSyncAttempts = 0;
 window.current_synth = 1;
-var knob_positions = {};
-
 
 // Once AMY module is loaded, register its functions and start AMY (not yet audio, you need to click for that)
 amyModule().then(async function(am) {
@@ -235,9 +233,6 @@ function get_events_for_patch_number(patch_number) {
   for (let i = 0; i < limit; i += 1) {
     const base = eventsPtr + i * layout.size;
     const status = view.getUint8(base + offsets.status);
-    if (status === EVENT_EMPTY) {
-      break;
-    }
     events.push(readEvent(base));
   }
 
@@ -399,46 +394,13 @@ function save_to_patch(patchNumber) {
     amy_add_log_message("K" + patchNumber + payload);
   }
   amy_add_log_message("i" + window.current_synth + "K" + patchNumber);
-  // also save the positions of the knobs to a map, like knob_positions[patchNumber] = {knob_index: value, ...}
-  if (Array.isArray(knobList)) {
-    const patchState = {};
-    knobList.forEach(function(knob, index) {
-      if (!knob || knob.knob_type === "spacer" || knob.knob_type === "spacer-half") {
-        return;
-      }
-      patchState[index] = Number(knob.default_value);
-    });
-    knob_positions[patchNumber] = patchState;
-  }
-
 }
 
 function load_from_patch(patchNumber) {
   // Hook for loading a saved memory patch number.
-  // This doesn't set the knobs yet because we don't have access to events from a memory patch number 
   set_knobs_from_patch_number(patchNumber);
-  // and here reload the positions of the knobs (set them) from the stored knob_posistions[patchNumber] if it is set
-  restore_knobs_from_saved_knobs(patchNumber);
 }
 
-function restore_knobs_from_saved_knobs(patchNumber) {
-  const patchState = knob_positions[patchNumber];
-  const knobList = window.get_current_knobs ? window.get_current_knobs() : [];
-  if (!patchState || !Array.isArray(knobList)) {
-    return;
-  }
-  Object.keys(patchState).forEach(function(key) {
-    const index = Number(key);
-    if (!Number.isInteger(index) || !knobList[index]) {
-      return;
-    }
-    const value = patchState[key];
-    if (!Number.isFinite(value)) {
-      return;
-    }
-    set_knob_ui_value(knobList[index], value, false);
-  });
-}
 
 async function amy_external_midi_input_js_hook(bytes, len, sysex) {
     mp.midiInHook(bytes, len, sysex);