Remove Mixbus Aux-Link special case 2/2

This commit is contained in:
Robin Gareus 2020-03-23 17:45:55 +01:00
parent d050256a41
commit 42cc09af13
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 14 additions and 22 deletions

View file

@ -798,14 +798,12 @@ ProcessorEntry::build_send_options_menu ()
Menu* menu = manage (new Menu); Menu* menu = manage (new Menu);
MenuList& items = menu->items (); MenuList& items = menu->items ();
if (!ARDOUR::Profile->get_mixbus()) { boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor); if (send) {
if (send) { items.push_back (CheckMenuElem (_("Link panner controls")));
items.push_back (CheckMenuElem (_("Link panner controls"))); Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); c->set_active (send->panner_shell()->is_linked_to_route());
c->set_active (send->panner_shell()->is_linked_to_route()); c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
}
} }
boost::shared_ptr<InternalSend> aux = boost::dynamic_pointer_cast<InternalSend> (_processor); boost::shared_ptr<InternalSend> aux = boost::dynamic_pointer_cast<InternalSend> (_processor);
@ -4095,10 +4093,6 @@ ProcessorBox::edit_aux_send (boost::shared_ptr<Processor> processor)
if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) { if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
return false; return false;
} }
if (ARDOUR::Profile->get_mixbus()) {
/* don't allow editing sends, ignore switch to send-edit */
return true;
}
if (_parent_strip) { if (_parent_strip) {
boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor); boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);

View file

@ -2699,16 +2699,14 @@ RCOptionEditor::RCOptionEditor ()
)); ));
if (!ARDOUR::Profile->get_mixbus()) { add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing"))); add_option (_("Mixer"),
add_option (_("Mixer"), new BoolOption (
new BoolOption ( "link-send-and-route-panner",
"link-send-and-route-panner", _("Link panners of Aux and External Sends with main panner by default"),
_("Link panners of Aux and External Sends with main panner by default"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner), sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner) ));
));
}
/* Signal Flow */ /* Signal Flow */