X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftoolbar.cpp;h=629205c6ce89cba05f2f2b77eaaf1583e6cd99f8;hb=cd6686b4821de95505ac94115e0966e4ff7cdc57;hp=ec18adb259980ef19ff17805ac2bcadbf75cacf3;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git

diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp
index ec18adb..629205c 100644
--- a/source/designer/toolbar.cpp
+++ b/source/designer/toolbar.cpp
@@ -79,10 +79,10 @@ Toolbar::Toolbar(Designer &d):
 	btn->set_tooltip("Add selected tracks to current route");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
-	designer.get_layout()->signal_route_added.connect(sigc::mem_fun(this, &Toolbar::route_added));
-	designer.get_layout()->signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes)));
+	designer.get_layout().signal_route_added.connect(sigc::mem_fun(this, &Toolbar::route_added));
+	designer.get_layout().signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes)));
 
-	const set<Route *> &routes = designer.get_layout()->get_routes();
+	const set<Route *> &routes = designer.get_layout().get_routes();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		(*i)->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes)));
 
@@ -93,8 +93,8 @@ void Toolbar::route_selected(unsigned index, const string &)
 {
 	if(index==drp_routes->get_n_items()-1)
 	{
-		Layout &layout = *designer.get_layout();
-		const set<Route *> &routes = designer.get_layout()->get_routes();
+		Layout &layout = designer.get_layout();
+		const set<Route *> &routes = layout.get_routes();
 		Route *route = new Route(layout);
 		route->set_name(format("Route %d", routes.size()));
 		designer.edit_route(route);
@@ -108,7 +108,7 @@ void Toolbar::route_selected(unsigned index, const string &)
 	}
 	else
 	{
-		const set<Route *> &routes = designer.get_layout()->get_routes();
+		const set<Route *> &routes = designer.get_layout().get_routes();
 		set<Route *>::const_iterator i = routes.begin();
 		advance(i, index);
 		designer.edit_route(*i);
@@ -131,7 +131,7 @@ void Toolbar::route_added(Route &r)
 void Toolbar::update_routes()
 {
 	drp_routes->clear();
-	const set<Route *> &routes = designer.get_layout()->get_routes();
+	const set<Route *> &routes = designer.get_layout().get_routes();
 	int selected = -1;
 	unsigned n = 0;
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)