More tweaks to FP8 layout for 32C

diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 81da4c9feeca3f2424b3b71198a01e4d948e184d..644d32e784c07e28a54fee92ae58c7c9ac386556 100644 (file)
--- 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 ());