processor naming tweaks, processor visibility tweaks and more, trying to finish this audio routing thing...

git-svn-id: svn://localhost/ardour2/branches/3.0@5364 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 9 insertions, 8 deletions

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 9ba3632d2d..e874550712 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -46,6 +46,7 @@
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
+#include "ardour/internal_send.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/meter.h"
 #include "ardour/plugin_insert.h"
@@ -768,11 +769,9 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 		return;
 	}
 
-#if 0
-	if (processor == _route->amp() || !processor->visible()) {
+	if (!processor->visible()) {
 		return;
 	}
-#endif
 
 	Gtk::TreeModel::Row row = *(model->append());
 	row[columns.text] = processor_name (processor);
@@ -804,7 +803,8 @@ ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
 		name_display = " (";
 	}
 
-	if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+	if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0 && 
+	    !boost::dynamic_pointer_cast<InternalSend>(processor)) {
 
 		name_display += '>';
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index c7f835d2df..577dc1ea31 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -526,7 +526,8 @@ RouteUI::build_sends_menu ()
 	sends_menu->set_name ("ArdourContextMenu");
 	MenuList& items = sends_menu->items();
 	
-	items.push_back (MenuElem(_("Assign all tracks"), mem_fun (*this, &RouteUI::create_sends)));
+	items.push_back (MenuElem(_("Assign all tracks (prefader)"), bind (mem_fun (*this, &RouteUI::create_sends), PreFader)));
+	items.push_back (MenuElem(_("Assign all tracks (postfader)"), bind (mem_fun (*this, &RouteUI::create_sends), PostFader)));
 	items.push_back (MenuElem(_("Copy track gains to sends"), mem_fun (*this, &RouteUI::set_sends_gain_from_track)));
 	items.push_back (MenuElem(_("Set sends gain to -inf"), mem_fun (*this, &RouteUI::set_sends_gain_to_zero)));
 	items.push_back (MenuElem(_("Set sends gain to 0dB"), mem_fun (*this, &RouteUI::set_sends_gain_to_unity)));
@@ -534,9 +535,9 @@ RouteUI::build_sends_menu ()
 }
 
 void
-RouteUI::create_sends ()
+RouteUI::create_sends (Placement p)
 {
-	_session.globally_add_internal_sends (_route);
+	_session.globally_add_internal_sends (_route, p);
 }
 
 void
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 2bfbc4452d..c2f03eb394 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -123,7 +123,7 @@ class RouteUI : public virtual AxisView
 	void set_sends_gain_from_track ();
 	void set_sends_gain_to_zero ();
 	void set_sends_gain_to_unity ();
-	void create_sends ();
+	void create_sends (ARDOUR::Placement);
 
 	void solo_changed(void*);
 	void solo_changed_so_update_mute ();