X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Froute_processor_selection.cc;h=ab512d3bb1e1d92ea17450ef51adc698cbb90af7;hb=987c1cb94ac7a558a03ae308ff33528b7337d592;hp=1af1e0c968f393aea11b0f9ad6d2ca6617b9ced1;hpb=8687895abba4209a6de8d8a8fc1bda5996f0d875;p=ardour.git

diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 1af1e0c968..ab512d3bb1 100644
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -21,58 +21,67 @@
 #include <sigc++/bind.h>
 #include "pbd/error.h"
 
-#include "ardour/playlist.h"
-#include "ardour/processor.h"
-#include "ardour/route.h"
-
+#include "gui_thread.h"
+#include "mixer_strip.h"
 #include "route_processor_selection.h"
+#include "route_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-RouteRedirectSelection&
-RouteRedirectSelection::operator= (const RouteRedirectSelection& other)
+
+RouteProcessorSelection::RouteProcessorSelection()
+{
+}
+
+RouteProcessorSelection&
+RouteProcessorSelection::operator= (const RouteProcessorSelection& other)
 {
 	if (&other != this) {
 		processors = other.processors;
-		routes = other.routes;
+		axes = other.axes;
 	}
 	return *this;
 }
 
 bool
-operator== (const RouteRedirectSelection& a, const RouteRedirectSelection& b)
+operator== (const RouteProcessorSelection& a, const RouteProcessorSelection& b)
 {
 	// XXX MUST TEST PROCESSORS SOMEHOW
-	return a.routes == b.routes;
+	return a.axes == b.axes;
 }
 
 void
-RouteRedirectSelection::clear ()
+RouteProcessorSelection::clear ()
 {
 	clear_processors ();
 	clear_routes ();
 }
 
 void
-RouteRedirectSelection::clear_processors ()
+RouteProcessorSelection::clear_processors ()
 {
 	processors.clear ();
 	ProcessorsChanged ();
 }
 
 void
-RouteRedirectSelection::clear_routes ()
+RouteProcessorSelection::clear_routes ()
 {
-	routes.clear ();
-	RoutesChanged ();
+	PresentationInfo::ChangeSuspender cs;
+
+	for (AxisViewSelection::iterator i = axes.begin(); i != axes.end(); ++i) {
+		(*i)->set_selected (false);
+	}
+	axes.clear ();
+	drop_connections ();
 }
 
 void
-RouteRedirectSelection::add (XMLNode* node)
+RouteProcessorSelection::add (XMLNode* node)
 {
 	// XXX check for duplicate
 	processors.add (node);
@@ -80,7 +89,7 @@ RouteRedirectSelection::add (XMLNode* node)
 }
 
 void
-RouteRedirectSelection::set (XMLNode* node)
+RouteProcessorSelection::set (XMLNode* node)
 {
 	clear_processors ();
 	processors.set (node);
@@ -88,45 +97,48 @@ RouteRedirectSelection::set (XMLNode* node)
 }
 
 void
-RouteRedirectSelection::add (boost::shared_ptr<Route> r)
+RouteProcessorSelection::add (AxisView* r)
 {
-	if (find (routes.begin(), routes.end(), r) == routes.end()) {
-		routes.push_back (r);
+	if (axes.insert (r).second) {
+
+		r->set_selected (true);
 
-		// XXX SHAREDPTR FIXME
-		// void (RouteRedirectSelection::*pmf)(Route*) = &RouteRedirectSelection::remove;
-		// r->GoingAway.connect (sigc::bind (sigc::mem_fun(*this, pmf), r));
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
 
-		RoutesChanged();
+		if (ms) {
+			ms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RouteProcessorSelection::remove, this, _1), gui_context());
+		}
 	}
 }
 
 void
-RouteRedirectSelection::remove (boost::shared_ptr<Route> r)
+RouteProcessorSelection::remove (AxisView* r)
 {
-	list<boost::shared_ptr<Route> >::iterator i;
-	if ((i = find (routes.begin(), routes.end(), r)) != routes.end()) {
-		routes.erase (i);
-		RoutesChanged ();
+	ENSURE_GUI_THREAD (*this, &RouteProcessorSelection::remove, r);
+	PresentationInfo::ChangeSuspender cs;
+
+	AxisViewSelection::iterator i;
+	if ((i = find (axes.begin(), axes.end(), r)) != axes.end()) {
+		(*i)->set_selected (false);
+		axes.erase (i);
 	}
 }
 
 void
-RouteRedirectSelection::set (boost::shared_ptr<Route> r)
+RouteProcessorSelection::set (AxisView* r)
 {
 	clear_routes ();
 	add (r);
 }
 
 bool
-RouteRedirectSelection::selected (boost::shared_ptr<Route> r)
+RouteProcessorSelection::selected (AxisView* r)
 {
-	return find (routes.begin(), routes.end(), r) != routes.end();
+	return find (axes.begin(), axes.end(), r) != axes.end();
 }
 
 bool
-RouteRedirectSelection::empty ()
+RouteProcessorSelection::empty ()
 {
-	return processors.empty () && routes.empty ();
+	return processors.empty () && axes.empty ();
 }
-