Store zone blocks in order and use add_tracks to load them

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

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 66a55d77c838dbd29a8c2847c8eb48322aa9fb1d..ef9eb4891bda896d861f8de9fa2f9aaad9e10ae6 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -7,68 +7,63 @@ 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", 370),
-       designer(d)
+       Toolbar("Route"),
+       designer(d),
+       routes(&route_name)
 {
-       pnl_content->add(*(drp_routes = new GLtk::Dropdown));
-       drp_routes->set_geometry(GLtk::Geometry(0, 10, 250, 20));
+       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;
 
        pnl_content->add(*(btn = new GLtk::Button("Del")));
-       btn->set_geometry(GLtk::Geometry(250, 10, 40, 24));
        btn->set_style("red");
        btn->set_tooltip("Delete the current route");
        btn->signal_clicked.connect(sigc::mem_fun(this, &Routebar::delete_route_clicked));
 
        pnl_content->add(*(btn = new GLtk::Button("Name")));
-       btn->set_geometry(GLtk::Geometry(290, 10, 40, 24));
        btn->set_tooltip("Rename the current route");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::rename_route));
 
        pnl_content->add(*(btn = new GLtk::Button("Add")));
-       btn->set_geometry(GLtk::Geometry(330, 10, 40, 24));
        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::mem_fun(this, &Routebar::track_chain_removed));
 
-       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, &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();
-               const set<Route *> &routes = rlayout.get_routes();
                Route *route = new Route(rlayout);
-               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_routes();
-               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,24 +73,29 @@ 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::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_routes();
-       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);
 }