fix: move coupled feedback with learned controls

When a mute binding's feedback address follows its input message, update the feedback kind, channel, and number with the learned control. Preserve deliberately independent feedback mappings.

Tests: cargo test -p fader-config --test editor changing_a_mute_binding_moves_its_feedback_to_the_new_control --locked
Tests: cargo clippy -p fader-config --all-targets --all-features --locked -- -D warnings
This commit is contained in:
Dandaedre 2026-10-16 00:05:10 +02:00
parent a48dcab234
commit c7d2450efb
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
2 changed files with 77 additions and 0 deletions

View File

@ -695,6 +695,18 @@ fn update_binding_table(
channel: u16,
number: u16,
) {
let feedback_follows_message = table
.get("message")
.and_then(Item::as_inline_table)
.zip(table.get("feedback").and_then(Item::as_inline_table))
.is_some_and(|(message, feedback)| {
message.get("kind").and_then(Value::as_str)
== feedback.get("kind").and_then(Value::as_str)
&& message.get("channel").and_then(Value::as_integer)
== feedback.get("channel").and_then(Value::as_integer)
&& message.get("number").and_then(Value::as_integer)
== feedback.get("number").and_then(Value::as_integer)
});
table["surface"] = value(surface);
table["fader"] = value(fader);
table["action"] = value(match action {
@ -717,6 +729,21 @@ fn update_binding_table(
message.insert("channel", Value::from(i64::from(channel)));
message.insert("number", Value::from(i64::from(number)));
table["message"] = value(message);
if feedback_follows_message
&& let Some(feedback) = table
.get_mut("feedback")
.and_then(Item::as_inline_table_mut)
{
feedback.insert(
"kind",
Value::from(match kind {
MessageKind::Cc => "cc",
MessageKind::Note => "note",
}),
);
feedback.insert("channel", Value::from(i64::from(channel)));
feedback.insert("number", Value::from(i64::from(number)));
}
}
fn string_array(values: &[&str]) -> Array {

View File

@ -323,3 +323,53 @@ fn selector_and_binding_edits_preserve_unrelated_capture_and_actions() {
binding.fader() == "media-fader" && binding.action() == Action::ToggleMute
}));
}
#[test]
fn changing_a_mute_binding_moves_its_feedback_to_the_new_control() {
let mut draft = ProfileDocument::parse(PROFILE).unwrap();
draft
.set_binding(
"desk-left",
"media-fader",
Action::ToggleMute,
MessageKind::Note,
1,
41,
)
.unwrap();
let profile = draft.preview().unwrap();
let binding = profile
.bindings()
.iter()
.find(|binding| binding.action() == Action::ToggleMute)
.unwrap();
assert_eq!(binding.number(), 41);
let feedback = binding.feedback().expect("existing feedback is retained");
assert_eq!(feedback.number(), 41);
assert_eq!((feedback.on(), feedback.off()), (127, 0));
let independently_mapped = PROFILE.replace(
"feedback = { kind = \"note\", channel = 1, number = 32, on = 127, off = 0 }",
"feedback = { kind = \"note\", channel = 1, number = 33, on = 127, off = 0 }",
);
let mut draft = ProfileDocument::parse(&independently_mapped).unwrap();
draft
.set_binding(
"desk-left",
"media-fader",
Action::ToggleMute,
MessageKind::Note,
1,
41,
)
.unwrap();
let profile = draft.preview().unwrap();
let feedback = profile
.bindings()
.iter()
.find(|binding| binding.action() == Action::ToggleMute)
.and_then(|binding| binding.feedback())
.unwrap();
assert_eq!(feedback.number(), 33);
}