X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Froutebar.cpp;h=ef9eb4891bda896d861f8de9fa2f9aaad9e10ae6;hb=862d8bea6d31e6fe9a60747e0b9559f77e72bf44;hp=9726b2e88f8c853a05f995483e68eafefe67cc4f;hpb=d32eab21ebacb78500dc46af5b5a6354a9a37fe2;p=r2c2.git

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 9726b2e..ef9eb48 100644
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -7,13 +7,18 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
+string route_name(Route *const &route)
+{
+	return route ? route->get_name() : "(new route)";
+}
+
 Routebar::Routebar(Designer &d):
 	Toolbar("Route"),
-	designer(d)
+	designer(d),
+	routes(&route_name)
 {
-	pnl_content->add(*(drp_routes = new GLtk::Dropdown));
+	pnl_content->add(*(drp_routes = new GLtk::Dropdown(routes)));
 	drp_routes->set_tooltip("Select route to edit");
-	drp_routes->append("(new route)");
 	drp_routes->signal_item_selected.connect(sigc::mem_fun(this, &Routebar::route_selected));
 
 	GLtk::Button *btn;
@@ -32,39 +37,33 @@ Routebar::Routebar(Designer &d):
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
 	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)));
+	designer.get_layout().signal_track_chain_removed.connect(sigc::mem_fun(this, &Routebar::track_chain_removed));
 
-	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)));
+	const set<Route *> &lroutes = designer.get_layout().get_all<Route>();
+	for(set<Route *>::const_iterator i=lroutes.begin(); i!=lroutes.end(); ++i)
+	{
+		routes.append(*i);
+		(*i)->signal_name_changed.connect(sigc::bind(sigc::mem_fun(this, &Routebar::route_name_changed), *i));
+	}
 
-	update_routes();
+	routes.append(0);
 }
 
-void Routebar::route_selected(unsigned index, const string &)
+void Routebar::route_selected(unsigned index)
 {
-	if(index==drp_routes->get_n_items()-1)
+	if(index==routes.size()-1)
 	{
 		Layout &rlayout = designer.get_layout();
 		Route *route = new Route(rlayout);
-		const set<Route *> &routes = rlayout.get_all<Route>();
-		route->set_name(format("Route %d", routes.size()));
+		route->set_name(format("Route %d", index+1));
 		designer.edit_route(route);
 
-		int selected = -1;
-		unsigned n = 0;
-		for(set<Route *>::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n)
-			if(*i==route)
-				selected = n;
-		drp_routes->set_selected_index(selected);
+		for(unsigned i=0; i<routes.size(); ++i)
+			if(routes.get(i)==route)
+				drp_routes->set_selected_index(i);
 	}
 	else
-	{
-		const set<Route *> &routes = designer.get_layout().get_all<Route>();
-		set<Route *>::const_iterator i = routes.begin();
-		advance(i, index);
-		designer.edit_route(*i);
-	}
+		designer.edit_route(routes.get(index));
 }
 
 void Routebar::delete_route_clicked()
@@ -78,23 +77,25 @@ void Routebar::track_chain_added(TrackChain &tc)
 {
 	if(Route *r = dynamic_cast<Route *>(&tc))
 	{
-		r->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Routebar::update_routes)));
-		update_routes();
+		r->signal_name_changed.connect(sigc::bind(sigc::mem_fun(this, &Routebar::route_name_changed), r));
+		routes.insert(routes.size()-1, r);
 	}
 }
 
-void Routebar::update_routes()
+void Routebar::track_chain_removed(TrackChain &tc)
 {
-	drp_routes->clear();
-	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)
+	if(Route *r = dynamic_cast<Route *>(&tc))
 	{
-		drp_routes->append((*i)->get_name());
-		if(*i==designer.get_current_route())
-			selected = n;
+		for(unsigned i=0; i<routes.size(); ++i)
+			if(routes.get(i)==r)
+			{
+				routes.remove(i);
+				break;
+			}
 	}
-	drp_routes->append("(new route)");
-	drp_routes->set_selected_index(selected);
+}
+
+void Routebar::route_name_changed(const string &, Route *route)
+{
+	routes.refresh(route);
 }