Make use of the unified storage class for other parts of Layout

[r2c2.git] / source / designer / routebar.cpp

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 66a55d77c838dbd29a8c2847c8eb48322aa9fb1d..cebd1d76edabeb06d85dc85ce066306f278a9a02 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -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)