diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index bb268d342a..77490b4db7 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -644,10 +644,8 @@
#ifdef MIXBUS
-#ifdef MIXBUS32C
-#endif
#endif
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index fab5ed2bf9..84d37c9126 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2863,7 +2863,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Appearance/Mixer"), new OptionEditorHeading (_("Mixer Strip")));
#endif
-#ifndef MIXBUS32C
+#ifndef MIXBUS
add_option (_("Appearance/Mixer"),
new BoolOption (
"default-narrow_ms",
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 1831fe83d8..8ba6682415 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -820,9 +820,6 @@ def build(bld):
if bld.is_defined('MIXBUS'):
menus_argv += [ '-DMIXBUS' ]
- if bld.is_defined('MIXBUS32C'):
- menus_argv += [ '-DMIXBUS32C' ]
-
if bld.is_defined('PTFORMAT'):
menus_argv += [ '-DPTFORMAT' ]
@@ -837,7 +834,8 @@ def build(bld):
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
- obj.dep_vars = ['PTFORMAT', 'MIXBUS', 'MIXBUS32C', 'WINDOWS', 'debug']
+
+ obj.dep_vars = ['PTFORMAT', 'MIXBUS', 'WINDOWS', 'debug']
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')
diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 029a1589fc..20926f87f0 100644
--- a/libs/surfaces/faderport8/faderport8.cc
+++ b/libs/surfaces/faderport8/faderport8.cc
@@ -1335,14 +1335,11 @@ FaderPort8::build_well_known_processor_ctrls (std::shared_ptr s, int
{ /* EQ */
int cnt = s->eq_band_cnt();
-#ifdef MIXBUS32C
+#ifdef MIXBUS
PUSH_BACK_NON_NULL ("Flt In", s->filter_enable_controllable (true)); // both HP/LP
PUSH_BACK_NON_NULL ("HP Freq", s->filter_freq_controllable (true));
PUSH_BACK_NON_NULL ("LP Freq", s->filter_freq_controllable (false));
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->filter_freq_controllable (true));
#endif
for (int band = 0; band < cnt; ++band) {
diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc
index ee431182b4..a2f09c157b 100644
--- a/libs/surfaces/launch_control_xl/controllers.cc
+++ b/libs/surfaces/launch_control_xl/controllers.cc
@@ -109,8 +109,6 @@ LaunchControlXL::build_maps ()
boost::function (boost::bind(&LaunchControlXL::dm_mb_check_send_knob, this, static_cast(i + 16))));
}
-#ifdef MIXBUS32C // from here 32C only
-
if (first_selected_stripable() && (first_selected_stripable()->is_master() || first_selected_stripable()->mixbus())) {
MAKE_DM_KNOB (SendA1, 13, 0, AmberFull, AmberLow, boost::function
(boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA1, true, 0)),
@@ -163,38 +161,6 @@ LaunchControlXL::build_maps ()
(boost::bind (&LaunchControlXL::dm_pan_azi, this, SendB4)),
boost::bind(&LaunchControlXL::dm_check_pan_azi, this));
-#else // from here Mixbus Standard only
- MAKE_DM_KNOB (SendA1, 13, 0, AmberFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA1, true, 0)),
- boost::function (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 0)));
- MAKE_DM_KNOB (SendA2, 14, 1, AmberFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA2, true, 1)),
- boost::function (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 1)));
- MAKE_DM_KNOB (SendA3, 15, 2, AmberFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA3, true, 2)),
- boost::function (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 2)));
- MAKE_DM_KNOB (SendA5, 17, 4, RedLow, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_pan_azi, this, SendA5)),
- boost::bind(&LaunchControlXL::dm_check_pan_azi, this));
- MAKE_DM_KNOB (SendA6, 18, 5, RedLow, RedLow, boost::function
- (boost::bind (&LaunchControlXL::dm_pan_width, this, SendA6)),
- boost::bind(&LaunchControlXL::dm_check_pan_width, this));
- MAKE_DM_KNOB (SendA7, 19, 6, AmberLow, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_tapedrive, this, SendA7)),
- boost::bind(&LaunchControlXL::dm_mb_has_tapedrive, this));
- MAKE_DM_KNOB (SendB1, 29, 8, YellowFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendB1, false, 0)),
- boost::bind(&LaunchControlXL::dm_mb_eq_freq_enabled, this));
- MAKE_DM_KNOB (SendB2, 30, 9, YellowFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendB2, false, 1)),
- boost::bind(&LaunchControlXL::dm_mb_eq_freq_enabled, this));
- MAKE_DM_KNOB (SendB3, 31, 10, YellowFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_eq, this, SendB3, false, 2)),
- boost::bind(&LaunchControlXL::dm_mb_eq_freq_enabled, this));
- MAKE_DM_KNOB (SendB4, 32, 11, YellowFull, AmberLow, boost::function
- (boost::bind (&LaunchControlXL::dm_mb_flt_frq, this, SendB4, true)),
- boost::bind(&LaunchControlXL::dm_mb_eq_freq_enabled, this));
-#endif
#else // from here Ardour
#endif
}
@@ -306,9 +272,6 @@ LaunchControlXL::build_maps ()
boost::bind (&LaunchControlXL::dm_solo_enabled, this));
MAKE_CTRL_BUTTON_PRESS(Control3, 75, 34, AmberFull, AmberLow, (boost::bind (&LaunchControlXL::dm_mb_eq_switch, this)),
boost::function (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 0)));
-
-
-#ifdef MIXBUS32C // from here 32C only
MAKE_CTRL_BUTTON_PRESS(Control4, 76, 35, AmberFull, AmberLow,
boost::function (boost::bind (&LaunchControlXL::dm_mb_eq_shape_switch, this, 0)),
boost::function (boost::bind(&LaunchControlXL::dm_mb_eq_shape_enabled, this, 0 )));
@@ -321,16 +284,6 @@ LaunchControlXL::build_maps ()
boost::bind(&LaunchControlXL::dm_mb_master_assign_enabled, this));
MAKE_CTRL_BUTTON_PRESS(Control8, 92, 39, GreenFull, GreenLow, (boost::bind (&LaunchControlXL::dm_mb_comp_switch, this)),
boost::bind(&LaunchControlXL::dm_mb_comp_enabled, this));
-
-#else // from here Mixbus Standard only
- MAKE_CTRL_BUTTON_PRESS(Control5, 89, 36, GreenFull, GreenLow, (boost::bind (&LaunchControlXL::dm_mb_master_assign_switch, this)),
- boost::bind(&LaunchControlXL::dm_mb_master_assign_enabled, this));
- MAKE_CTRL_BUTTON_PRESS(Control7, 91, 38, GreenFull, GreenLow, (boost::bind (&LaunchControlXL::dm_mb_comp_switch, this)),
- boost::bind(&LaunchControlXL::dm_mb_comp_enabled, this));
- MAKE_CTRL_BUTTON_PRESS(Control8, 92, 39, RedFull, RedLow, (boost::bind (&LaunchControlXL::dm_recenable_switch, this)),
- boost::bind(&LaunchControlXL::dm_recenable_enabled, this));
-
-#endif
#else // Ardour
#endif
}
diff --git a/libs/surfaces/launch_control_xl/gui.cc b/libs/surfaces/launch_control_xl/gui.cc
index 70a1bd745d..aa91dfc2d2 100644
--- a/libs/surfaces/launch_control_xl/gui.cc
+++ b/libs/surfaces/launch_control_xl/gui.cc
@@ -126,7 +126,7 @@ LCXLGUI::LCXLGUI (LaunchControlXL& p)
row++;
/* User Settings */
-#ifdef MIXBUS32C
+#ifdef MIXBUS
l = manage (new Gtk::Label (_("Control sends 7-12 in Mixer Mode")));
l->set_alignment (1.0, 0.5);
table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
@@ -303,7 +303,7 @@ LCXLGUI::toggle_fader8master ()
DEBUG_TRACE(DEBUG::LaunchControlXL, string_compose("use_fader8master IS: %1\n", lcxl.fader8master()));
}
-#ifdef MIXBUS32C
+#ifdef MIXBUS
void
LCXLGUI::toggle_ctrllowersends ()
{
diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.cc b/libs/surfaces/launch_control_xl/launch_control_xl.cc
index 3938cafd82..f316a4dd37 100644
--- a/libs/surfaces/launch_control_xl/launch_control_xl.cc
+++ b/libs/surfaces/launch_control_xl/launch_control_xl.cc
@@ -79,7 +79,7 @@ LaunchControlXL::LaunchControlXL (ARDOUR::Session& s)
, _template_number(8) // default template (factory 1)
, _fader8master (false)
, _device_mode (false)
-#ifdef MIXBUS32C
+#ifdef MIXBUS
, _ctrllowersends (false)
, _fss_is_mixbus (false)
#endif
@@ -164,7 +164,7 @@ LaunchControlXL::begin_using_device ()
if (fader8master()) {
set_fader8master (fader8master());
}
-#ifdef MIXBUS32C
+#ifdef MIXBUS
if (ctrllowersends()) {
set_ctrllowersends (ctrllowersends());
}
@@ -758,7 +758,7 @@ LaunchControlXL::get_state() const
child = new XMLNode (X_("Configuration"));
child->set_property ("fader8master", fader8master());
-#ifdef MIXBUS32C
+#ifdef MIXBUS
child->set_property ("ctrllowersends", ctrllowersends());
#endif
node.add_child_nocopy (*child);
@@ -798,7 +798,7 @@ LaunchControlXL::set_state (const XMLNode & node, int version)
if ((child = node.child (X_("Configuration"))) !=0) {
/* this should propably become a for-loop at some point */
child->get_property ("fader8master", _fader8master);
-#ifdef MIXBUS32C
+#ifdef MIXBUS
child->get_property ("ctrllowersends", _ctrllowersends);
#endif
}
@@ -884,7 +884,7 @@ LaunchControlXL::stripable_selection_changed ()
if (!device_mode()) {
switch_bank (bank_start);
} else {
-#ifdef MIXBUS32C
+#ifdef MIXBUS
if (first_selected_stripable()) {
DEBUG_TRACE (DEBUG::LaunchControlXL, "32C special handling. Checking if stripable type changed\n");
bool fss_unchanged;
@@ -1213,7 +1213,7 @@ LaunchControlXL::init_dm_callbacks()
}
-#ifdef MIXBUS32C
+#ifdef MIXBUS
void
LaunchControlXL::store_fss_type()
{
@@ -1237,7 +1237,7 @@ LaunchControlXL::init_device_mode()
DEBUG_TRACE (DEBUG::LaunchControlXL, "Initializing device mode\n");
init_knobs();
init_buttons(false);
-#ifdef MIXBUS32C
+#ifdef MIXBUS
set_ctrllowersends(false);
store_fss_type();
#endif
@@ -1304,7 +1304,7 @@ LaunchControlXL::set_device_mode (bool yn)
if (device_mode()) {
init_device_mode();
} else {
-#ifdef MIXBUS32C
+#ifdef MIXBUS
set_ctrllowersends(ctrllowersends());
#endif
switch_bank (bank_start);
@@ -1330,7 +1330,7 @@ LaunchControlXL::set_fader8master (bool yn)
switch_bank (bank_start);
}
-#ifdef MIXBUS32C
+#ifdef MIXBUS
void
LaunchControlXL::set_ctrllowersends (bool yn)
{
@@ -1355,7 +1355,7 @@ LaunchControlXL::set_send_bank (int offset)
int lowersendsoffset = 0;
-#ifdef MIXBUS32C
+#ifdef MIXBUS
if (ctrllowersends() && !device_mode()) {
lowersendsoffset = 6;
}
diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.h b/libs/surfaces/launch_control_xl/launch_control_xl.h
index bae57f3242..e96e9c42ad 100644
--- a/libs/surfaces/launch_control_xl/launch_control_xl.h
+++ b/libs/surfaces/launch_control_xl/launch_control_xl.h
@@ -391,7 +391,7 @@ public:
void set_device_mode (bool yn);
bool device_mode () const { return _device_mode; }
-#ifdef MIXBUS32C
+#ifdef MIXBUS
void set_ctrllowersends (bool yn);
bool ctrllowersends () const { return _ctrllowersends; }
@@ -416,7 +416,7 @@ private:
bool _fader8master;
bool _device_mode;
-#ifdef MIXBUS32C
+#ifdef MIXBUS
bool _ctrllowersends;
bool _fss_is_mixbus;
#endif
diff --git a/libs/surfaces/mackie/subview.cc b/libs/surfaces/mackie/subview.cc
index f389a78d70..5248e7a10f 100644
--- a/libs/surfaces/mackie/subview.cc
+++ b/libs/surfaces/mackie/subview.cc
@@ -323,7 +323,6 @@ void EQSubview::setup_vpot(
std::string band_name;
if (_subview_stripable->is_input_strip ()) {
-#ifdef MIXBUS32C
switch (global_strip_position) {
case 0:
case 2:
@@ -359,37 +358,6 @@ void EQSubview::setup_vpot(
break;
}
-#else //regular Mixbus channel EQ
-
- switch (global_strip_position) {
- case 0:
- case 2:
- case 4:
- eq_band = global_strip_position / 2;
- pc = _subview_stripable->eq_gain_controllable (eq_band);
- band_name = _subview_stripable->eq_band_name (eq_band);
- pot_id = band_name + "Gain";
- break;
- case 1:
- case 3:
- case 5:
- eq_band = global_strip_position / 2;
- pc = _subview_stripable->eq_freq_controllable (eq_band);
- band_name = _subview_stripable->eq_band_name (eq_band);
- pot_id = band_name + "Freq";
- break;
- case 6:
- pc = _subview_stripable->eq_enable_controllable();
- pot_id = "EQ";
- break;
- case 7:
- pc = _subview_stripable->filter_freq_controllable(true);
- pot_id = "HP Freq";
- break;
- }
-
-#endif
-
} else { //mixbus or master bus ( these are currently the same for MB & 32C )
switch (global_strip_position) {
case 0:
@@ -494,11 +462,9 @@ void DynamicsSubview::setup_vpot(
std::shared_ptr kc = _subview_stripable->comp_makeup_controllable ();
std::shared_ptr ec = _subview_stripable->comp_enable_controllable ();
-#ifdef MIXBUS32C //Mixbus32C needs to spill the filter controls into the comp section
std::shared_ptr hpfc = _subview_stripable->filter_freq_controllable (true);
std::shared_ptr lpfc = _subview_stripable->filter_freq_controllable (false);
std::shared_ptr fec = _subview_stripable->filter_enable_controllable (true); // shared HP/LP
-#endif
/* we will control the global_strip_position-th available parameter, from the list in the
* order shown above.
@@ -513,11 +479,9 @@ void DynamicsSubview::setup_vpot(
if (kc) { available.push_back (std::make_pair (kc, "Makeup")); }
if (ec) { available.push_back (std::make_pair (ec, "on/off")); }
-#ifdef MIXBUS32C //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")); }
-#endif
if (global_strip_position >= available.size()) {
/* this knob is not needed to control the available parameters */
diff --git a/libs/surfaces/us2400/strip.cc b/libs/surfaces/us2400/strip.cc
index 1cddfdacce..f74e87eef0 100644
--- a/libs/surfaces/us2400/strip.cc
+++ b/libs/surfaces/us2400/strip.cc
@@ -861,7 +861,6 @@ Strip::setup_trackview_vpot (std::shared_ptr r)
} else if (r->is_input_strip ()) {
-#ifdef MIXBUS32C
switch (global_pos) {
case 6:
pc = r->filter_freq_controllable(true);
@@ -886,30 +885,6 @@ Strip::setup_trackview_vpot (std::shared_ptr r)
} break;
}
-#else //regular Mixbus channel EQ
-
- switch (global_pos) {
- case 7:
- pc = r->filter_freq_controllable(true);
- break;
- case 8:
- case 10:
- case 12:
- eq_band = (global_pos-8) / 2;
- pc = r->eq_gain_controllable (eq_band);
- _vpot->set_mode(Pot::boost_cut);
- break;
- case 9:
- case 11:
- case 13:
- eq_band = (global_pos-8) / 2;
- pc = r->eq_freq_controllable (eq_band);
- break;
- }
-
-
-#endif
-
//mixbus sends
switch (global_pos) {
case 16:
diff --git a/libs/surfaces/us2400/surface.cc b/libs/surfaces/us2400/surface.cc
index c8aab56386..c30e7c933d 100644
--- a/libs/surfaces/us2400/surface.cc
+++ b/libs/surfaces/us2400/surface.cc
@@ -617,7 +617,7 @@ Surface::handle_midi_controller_message (MIDI::Parser &, MIDI::EventTwoBytes* ev
#endif
}
-#ifdef MIXBUS32C //in 32C, we can use the joystick for the last 2 mixbus send level & pans
+#ifdef MIXBUS //we can use the joystick for the last 2 mixbus send level & pans
if (_stype == st_joy && _joystick_active) {
if (ev->controller_number == 0x03) {