X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Froutebar.cpp;h=cebd1d76edabeb06d85dc85ce066306f278a9a02;hb=d2dfed1a38c5e8487532e9055fad464cf54efd83;hp=2cc9058f0638a4cc19c09d8d7eef19ea59cdb63b;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 2cc9058..cebd1d7 100644
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/route.h"
 #include "designer.h"
 #include "routebar.h"
@@ -35,10 +35,10 @@ Routebar::Routebar(Designer &d):
 	btn->set_tooltip("Add selected tracks to current route (A)");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
-	designer.get_layout().signal_route_added.connect(sigc::mem_fun(this, &Routebar::route_added));
-	designer.get_layout().signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
+	designer.get_layout().signal_track_chain_added.connect(sigc::mem_fun(this, &Routebar::track_chain_added));
+	designer.get_layout().signal_track_chain_removed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
 
-	const set<Route *> &routes = designer.get_layout().get_routes();
+	const set<Route *> &routes = designer.get_layout().get_all<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		(*i)->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
 
@@ -50,8 +50,8 @@ void Routebar::route_selected(unsigned index, const string &)
 	if(index==drp_routes->get_n_items()-1)
 	{
 		Layout &rlayout = designer.get_layout();
-		const set<Route *> &routes = rlayout.get_routes();
 		Route *route = new Route(rlayout);
+		const set<Route *> &routes = rlayout.get_all<Route>();
 		route->set_name(format("Route %d", routes.size()));
 		designer.edit_route(route);
 
@@ -64,7 +64,7 @@ void Routebar::route_selected(unsigned index, const string &)
 	}
 	else
 	{
-		const set<Route *> &routes = designer.get_layout().get_routes();
+		const set<Route *> &routes = designer.get_layout().get_all<Route>();
 		set<Route *>::const_iterator i = routes.begin();
 		advance(i, index);
 		designer.edit_route(*i);
@@ -78,16 +78,19 @@ void Routebar::delete_route_clicked()
 	delete route;
 }
 
-void Routebar::route_added(Route &r)
+void Routebar::track_chain_added(TrackChain &tc)
 {
-	r.signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
-	update_routes();
+	if(Route *r = dynamic_cast<Route *>(&tc))
+	{
+		r->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
+		update_routes();
+	}
 }
 
 void Routebar::update_routes()
 {
 	drp_routes->clear();
-	const set<Route *> &routes = designer.get_layout().get_routes();
+	const set<Route *> &routes = designer.get_layout().get_all<Route>();
 	int selected = -1;
 	unsigned n = 0;
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)