From c61cbe8b026a2ba4eff4eab5dc64aef2487eaa89 Mon Sep 17 00:00:00 2001 From: Franke Burgarino Date: Fri, 8 Aug 2025 16:10:24 -0500 Subject: [PATCH] MCU: move filter controls from dynamics subview to eq subview --- libs/surfaces/mackie/subview.cc | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libs/surfaces/mackie/subview.cc b/libs/surfaces/mackie/subview.cc index 7398f2db7f..02e42bd87d 100644 --- a/libs/surfaces/mackie/subview.cc +++ b/libs/surfaces/mackie/subview.cc @@ -357,6 +357,18 @@ void EQSubview::setup_vpot( pc = _subview_stripable->mapped_control(EQ_Enable); pot_id = "EQ"; break; + case 11: + pc = _subview_stripable->mapped_control(LPF_Freq); + pot_id = "LPF"; + break; + case 12: + pc = _subview_stripable->mapped_control(HPF_Freq); + pot_id = "HPF"; + break; + case 13: + pc = _subview_stripable->mapped_control(HPF_Enable); // shared HP/LP + pot_id = "Filter"; + break; } } else { //mixbus or master bus ( these are currently the same for MB & 32C ) @@ -460,10 +472,6 @@ void DynamicsSubview::setup_vpot( available.clear(); - std::shared_ptr hpfc = _subview_stripable->mapped_control (HPF_Freq); - std::shared_ptr lpfc = _subview_stripable->mapped_control (LPF_Freq); - std::shared_ptr fec = _subview_stripable->mapped_control (HPF_Enable); // shared HP/LP - std::shared_ptr ctc = _subview_stripable->mapped_control (Comp_Threshold); std::shared_ptr crc = _subview_stripable->mapped_control (Comp_Ratio); std::shared_ptr cac = _subview_stripable->mapped_control (Comp_Attack); @@ -483,11 +491,6 @@ void DynamicsSubview::setup_vpot( std::vector params; - //Mixbus32C needs to spill the filter controls into the comp section - if (hpfc) { available.push_back (std::make_pair (hpfc, "HPF")); } - if (lpfc) { available.push_back (std::make_pair (lpfc, "LPF")); } - if (fec) { available.push_back (std::make_pair (fec, "FiltIn")); } - if (ctc) { available.push_back (std::make_pair (ctc, "Thresh")); } if (crc) { available.push_back (std::make_pair (crc, "Ratio")); } if (cac) { available.push_back (std::make_pair (cac, "Attk")); }