Feat: begin slight refactoring
Some checks failed
Deploy Website / deploy (push) Failing after 4m46s

This commit is contained in:
2026-02-01 12:38:48 +01:00
parent a0585b0814
commit dd853b8e1b
39 changed files with 4699 additions and 3168 deletions

View File

@@ -18,7 +18,7 @@ pub fn default_ctx() -> StepContext {
speed: 1.0,
fill: false,
nudge_secs: 0.0,
cc_memory: None,
cc_access: None,
}
}

View File

@@ -1,6 +1,10 @@
use crate::harness::{default_ctx, expect_outputs, forth};
use cagire::forth::{CcMemory, StepContext};
use std::sync::{Arc, Mutex};
use cagire::forth::{CcAccess, StepContext};
use cagire::midi::CcMemory;
use std::sync::Arc;
#[allow(unused_imports)]
use cagire::forth::Value;
#[test]
fn test_midi_channel_set() {
@@ -42,16 +46,13 @@ fn test_ccval_returns_zero_without_cc_memory() {
#[test]
fn test_ccval_reads_from_cc_memory() {
let cc_memory: CcMemory = Arc::new(Mutex::new([[[0u8; 128]; 16]; 4]));
{
let mut mem = cc_memory.lock().unwrap();
mem[0][0][1] = 64; // device 0, channel 1 (0-indexed), CC 1, value 64
mem[0][5][74] = 127; // device 0, channel 6 (0-indexed), CC 74, value 127
}
let cc_memory = CcMemory::new();
cc_memory.set_cc(0, 0, 1, 64); // device 0, channel 1 (0-indexed), CC 1, value 64
cc_memory.set_cc(0, 5, 74, 127); // device 0, channel 6 (0-indexed), CC 74, value 127
let f = forth();
let ctx = StepContext {
cc_memory: Some(Arc::clone(&cc_memory)),
cc_access: Some(Arc::new(cc_memory.clone()) as Arc<dyn CcAccess>),
..default_ctx()
};
@@ -122,7 +123,10 @@ fn test_midi_full_defaults() {
fn test_midi_bend_center() {
let outputs = expect_outputs("0.0 bend m.", 1);
// 0.0 -> 8192 (center)
assert!(outputs[0].contains("/midi/bend/8191/chan/0") || outputs[0].contains("/midi/bend/8192/chan/0"));
assert!(
outputs[0].contains("/midi/bend/8191/chan/0")
|| outputs[0].contains("/midi/bend/8192/chan/0")
);
}
#[test]