diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2017-05-13 07:54:08 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2017-05-13 07:54:08 -0500 |
| commit | 6a28e027990562cb282b898a38dc17c1a0e88e26 (patch) | |
| tree | 7b4dc58d0cd9f16499f475586b07b1ef8f302fb4 | |
| parent | b92f75481ef253211cac2d2b2c87a236c8270133 (diff) | |
More tweaks to FP8 layout for 32C
| -rw-r--r-- | libs/surfaces/faderport8/faderport8.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc index 81da4c9fee..644d32e784 100644 --- a/libs/surfaces/faderport8/faderport8.cc +++ b/libs/surfaces/faderport8/faderport8.cc @@ -1062,14 +1062,17 @@ FaderPort8::build_well_known_processor_ctrls (boost::shared_ptr<Stripable> s, bo _proc_params.clear (); if (eq) { int cnt = s->eq_band_cnt(); - PUSH_BACK_NON_NULL ("Enable", s->eq_enable_controllable ()); - PUSH_BACK_NON_NULL ("HP/LP", s->filter_enable_controllable ()); -#ifdef MIXBUS32 - PUSH_BACK_NON_NULL ("Lo-Bell", s->eq_lpf_controllable ()); - PUSH_BACK_NON_NULL ("Hi-Bell", s->eq_hpf_controllable ()); -#else - PUSH_BACK_NON_NULL ("Freq HP", s->eq_hpf_controllable ()); -#endif + +#ifdef MIXBUS32C + PUSH_BACK_NON_NULL ("Flt In", s->filter_enable_controllable ()); + PUSH_BACK_NON_NULL ("HP Freq", s->eq_hpf_controllable ()); + PUSH_BACK_NON_NULL ("LP Freq", s->eq_lpf_controllable ()); + PUSH_BACK_NON_NULL ("EQ In", s->eq_enable_controllable ()); +#elif defined (MIXBUS) + PUSH_BACK_NON_NULL ("EQ In", s->eq_enable_controllable ()); + PUSH_BACK_NON_NULL ("HP Freq", s->eq_hpf_controllable ()); +#end + for (int band = 0; band < cnt; ++band) { std::string bn = s->eq_band_name (band); PUSH_BACK_NON_NULL (string_compose ("Gain %1", bn), s->eq_gain_controllable (band)); @@ -1078,7 +1081,7 @@ FaderPort8::build_well_known_processor_ctrls (boost::shared_ptr<Stripable> s, bo PUSH_BACK_NON_NULL (string_compose ("Shape %1", bn), s->eq_shape_controllable (band)); } } else { - PUSH_BACK_NON_NULL ("Enable", s->comp_enable_controllable ()); + PUSH_BACK_NON_NULL ("Comp In", s->comp_enable_controllable ()); PUSH_BACK_NON_NULL ("Threshold", s->comp_threshold_controllable ()); PUSH_BACK_NON_NULL ("Speed", s->comp_speed_controllable ()); PUSH_BACK_NON_NULL ("Mode", s->comp_mode_controllable ()); |