Ardour repo should not distinguish between Mixbus variants

This commit is contained in:
Ben Loftis 2024-01-08 08:19:39 -06:00
parent 083cf09108
commit ee6d46d403
11 changed files with 19 additions and 134 deletions

View file

@ -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;
}