ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour.menus.in
View File

@ -644,10 +644,8 @@
#ifdef MIXBUS
<separator/>
<menuitem action='ToggleStripCtrls'/>
#ifdef MIXBUS32C
<menuitem action='ToggleStripEQ'/>
<menuitem action='ToggleStripBus'/>
#endif
#endif
</menu>

2
gtk2_ardour/rc_option_editor.cc
View File

@ -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",

6
gtk2_ardour/wscript
View File

@ -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')

5
libs/surfaces/faderport8/faderport8.cc
View File

@ -1335,14 +1335,11 @@ FaderPort8::build_well_known_processor_ctrls (std::shared_ptr<Stripable> 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) {

47
libs/surfaces/launch_control_xl/controllers.cc
View File

@ -109,8 +109,6 @@ LaunchControlXL::build_maps ()
boost::function<uint8_t ()> (boost::bind(&LaunchControlXL::dm_mb_check_send_knob, this, static_cast<KnobID>(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<void ()>
(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<void ()>
(boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA1, true, 0)),
boost::function<uint8_t ()> (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 0)));
MAKE_DM_KNOB (SendA2, 14, 1, AmberFull, AmberLow, boost::function<void ()>
(boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA2, true, 1)),
boost::function<uint8_t ()> (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 1)));
MAKE_DM_KNOB (SendA3, 15, 2, AmberFull, AmberLow, boost::function<void ()>
(boost::bind (&LaunchControlXL::dm_mb_eq, this, SendA3, true, 2)),
boost::function<uint8_t ()> (boost::bind(&LaunchControlXL::dm_mb_eq_gain_enabled, this, 2)));
MAKE_DM_KNOB (SendA5, 17, 4, RedLow, AmberLow, boost::function<void ()>
(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<void ()>
(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<void ()>
(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<void ()>
(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<void ()>
(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<void ()>
(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<void ()>
(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<uint8_t()> (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<void()> (boost::bind (&LaunchControlXL::dm_mb_eq_shape_switch, this, 0)),
boost::function<uint8_t()> (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
}

4
libs/surfaces/launch_control_xl/gui.cc
View File

@ -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 ()
{

20
libs/surfaces/launch_control_xl/launch_control_xl.cc
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;
}

4
libs/surfaces/launch_control_xl/launch_control_xl.h
View File

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

36
libs/surfaces/mackie/subview.cc
View File

@ -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<AutomationControl> kc = _subview_stripable->comp_makeup_controllable ();
std::shared_ptr<AutomationControl> ec = _subview_stripable->comp_enable_controllable ();
#ifdef MIXBUS32C //Mixbus32C needs to spill the filter controls into the comp section
std::shared_ptr<AutomationControl> hpfc = _subview_stripable->filter_freq_controllable (true);
std::shared_ptr<AutomationControl> lpfc = _subview_stripable->filter_freq_controllable (false);
std::shared_ptr<AutomationControl> 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 */

25
libs/surfaces/us2400/strip.cc
View File

@ -861,7 +861,6 @@ Strip::setup_trackview_vpot (std::shared_ptr<Stripable> 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<Stripable> 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:

2
libs/surfaces/us2400/surface.cc
View File

@ -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) {