From f7acaf3ba47532fadb5a8fd6617e41331c3f264a Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sun, 18 Oct 2026 23:01:30 +0200 Subject: [PATCH] test: qualify M13.3e media feedback state transitions Extract the hardware-free media feedback plan for direct regression tests. Verify: cargo test -p fader_master media_feedback_is --quiet passed; cargo clippy -p fader_master --all-targets --all-features -- -D warnings passed; cargo fmt --all passed. --- fader_master/src/midi_runtime.rs | 112 +++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 5 deletions(-) diff --git a/fader_master/src/midi_runtime.rs b/fader_master/src/midi_runtime.rs index 6e32cf8..6342c81 100644 --- a/fader_master/src/midi_runtime.rs +++ b/fader_master/src/midi_runtime.rs @@ -195,6 +195,12 @@ pub struct MediaLearn { pub control: String, } +struct MediaFeedback { + key: (String, String, String), + bytes: [u8; 3], + on: bool, +} + impl std::fmt::Debug for MidiRuntime { fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { formatter @@ -685,9 +691,9 @@ impl MidiRuntime { } } - fn sync_media_feedback(&mut self, snapshot: &media::Snapshot) { + fn plan_media_feedback(&self, snapshot: &media::Snapshot) -> Vec { if !self.media_feedback_enabled { - return; + return Vec::new(); } let mut writes = Vec::new(); for (entry, matcher) in &self.media_entries { @@ -709,13 +715,17 @@ impl MidiRuntime { control.id.clone(), ); if self.media_sent.get(&key) != Some(&bytes) { - writes.push((key, bytes, on)); + writes.push(MediaFeedback { key, bytes, on }); } } } // Turn old state lights off before turning a new state light on. - writes.sort_by_key(|(_, _, on)| *on); - for (key, bytes, _) in writes { + writes.sort_by_key(|write| write.on); + writes + } + + fn sync_media_feedback(&mut self, snapshot: &media::Snapshot) { + for MediaFeedback { key, bytes, .. } in self.plan_media_feedback(snapshot) { let Ok(surface) = SurfaceId::new(&key.0) else { continue; }; @@ -807,6 +817,98 @@ mod tests { use fader_core::{MidiChannel, MidiData}; use midi::{ButtonEdge, MidiMessage}; + #[test] + fn media_feedback_is_confirmed_deduplicated_gated_and_resynchronized() { + let profile = + Profile::parse(include_str!("../../examples/profiles/arch-pipewire.toml")).unwrap(); + let mut runtime = MidiRuntime::new(&profile).unwrap(); + let selector = media::PlayerSelector { + field: media::PlayerField::BusName, + pattern: "org.mpris.MediaPlayer2.fixture".into(), + regex: false, + }; + let controls = [ + media::Action::Play, + media::Action::Pause, + media::Action::Stop, + ] + .into_iter() + .enumerate() + .map(|(i, action)| media::Control { + id: format!("button-{i}"), + action, + binding: Some(media::Binding { + surface: "buttons".into(), + message: media::Message { + kind: media::MessageKind::Note, + channel: 1, + number: i as u16, + }, + feedback: None, + }), + }) + .collect(); + runtime.media_entries.push(( + media::Entry { + id: "player".into(), + label: "Player".into(), + selector: selector.clone(), + feedback_enabled: true, + controls, + }, + selector.compile().unwrap(), + )); + let mut snapshot = media::Snapshot { + available: true, + error: None, + players: vec![media::Player { + bus_name: selector.pattern, + playback: Some(media::Playback::Playing), + ..media::Player::default() + }], + }; + let plan = runtime.plan_media_feedback(&snapshot); + assert_eq!(plan.iter().filter(|w| w.on).count(), 1); + assert_eq!(plan.last().unwrap().bytes, [0x90, 0, 127]); + for w in plan { + runtime.media_sent.insert(w.key, w.bytes); + } + assert!(runtime.plan_media_feedback(&snapshot).is_empty()); + snapshot.players[0].playback = Some(media::Playback::Paused); + let plan = runtime.plan_media_feedback(&snapshot); + assert_eq!( + plan.iter().map(|w| w.bytes).collect::>(), + [[0x90, 0, 0], [0x90, 1, 127]] + ); + runtime.media_feedback_enabled = false; + snapshot.players.clear(); + assert!(runtime.plan_media_feedback(&snapshot).is_empty()); // No clearing while disabled. + runtime.media_feedback_enabled = true; + assert_eq!(runtime.plan_media_feedback(&snapshot).len(), 1); // Clear confirmed old Playing. + runtime.media_entries[0].0.feedback_enabled = false; + assert!(runtime.plan_media_feedback(&snapshot).is_empty()); + runtime.media_entries[0].0.feedback_enabled = true; + runtime.disconnect_output(&SurfaceId::new("buttons").unwrap()); + assert_eq!(runtime.plan_media_feedback(&snapshot).len(), 3); // Full resync after reconnect. + let binding = runtime.media_entries[0].0.controls[0] + .binding + .as_mut() + .unwrap(); + binding.feedback = Some(media::Feedback { + message: binding.message.clone(), + on: 1, + off: 7, + }); + snapshot.players.push(media::Player { + bus_name: "org.mpris.MediaPlayer2.fixture".into(), + playback: Some(media::Playback::Paused), + ..media::Player::default() + }); + let plan = runtime.plan_media_feedback(&snapshot); + assert_eq!(plan.last().unwrap().bytes, [0x90, 1, 127]); // Logical off before on even if off is a color. + assert!(plan.iter().any(|w| !w.on && w.bytes == [0x90, 0, 7])); + } + #[test] fn media_triggers_are_press_edges_and_learn_is_scoped() { let profile =