From 42cc09af131b892b9db2f3a070f7d9c4fb73d57f Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 23 Mar 2020 17:45:55 +0100
Subject: Remove Mixbus Aux-Link special case 2/2

---
 gtk2_ardour/processor_box.cc    | 18 ++++++------------
 gtk2_ardour/rc_option_editor.cc | 18 ++++++++----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index d76b416e38..189808b122 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -798,14 +798,12 @@ ProcessorEntry::build_send_options_menu ()
 	Menu* menu = manage (new Menu);
 	MenuList& items = menu->items ();
 
-	if (!ARDOUR::Profile->get_mixbus()) {
-		boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
-		if (send) {
-			items.push_back (CheckMenuElem (_("Link panner controls")));
-			Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
-			c->set_active (send->panner_shell()->is_linked_to_route());
-			c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
-		}
+	boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
+	if (send) {
+		items.push_back (CheckMenuElem (_("Link panner controls")));
+		Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+		c->set_active (send->panner_shell()->is_linked_to_route());
+		c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
 	}
 
 	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) {
 		return false;
 	}
-	if (ARDOUR::Profile->get_mixbus()) {
-		/* don't allow editing sends, ignore switch to send-edit */
-		return true;
-	}
 
 	if (_parent_strip) {
 		boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 40580329c8..0024dbc043 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2699,16 +2699,14 @@ RCOptionEditor::RCOptionEditor ()
 		     ));
 
 
-	if (!ARDOUR::Profile->get_mixbus()) {
-		add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
-		add_option (_("Mixer"),
-				new BoolOption (
-					"link-send-and-route-panner",
-					_("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::set_link_send_and_route_panner)
-					));
-	}
+	add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
+	add_option (_("Mixer"),
+			new BoolOption (
+				"link-send-and-route-panner",
+				_("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::set_link_send_and_route_panner)
+				));
 
 	/* Signal Flow */
 
-- 
cgit v1.2.3