use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / editor_routes.cc

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 809dfd267f962aa719f59c0acdb70ed699d503f1..f6a5cffb0b25a3802e263ec77006719c42b1f226 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -549,10 +549,10 @@ EditorRoutes::build_menu ()
        items.push_back (MenuElem (_("Hide All"), sigc::mem_fun (*this, &EditorRoutes::hide_all_routes)));
        items.push_back (MenuElem (_("Show All Audio Tracks"), sigc::mem_fun (*this, &EditorRoutes::show_all_audiotracks)));
        items.push_back (MenuElem (_("Hide All Audio Tracks"), sigc::mem_fun (*this, &EditorRoutes::hide_all_audiotracks)));
-       items.push_back (MenuElem (_("Show All Audio Busses"), sigc::mem_fun (*this, &EditorRoutes::show_all_audiobus)));
-       items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun (*this, &EditorRoutes::hide_all_audiobus)));
        items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::show_all_miditracks)));
        items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::hide_all_miditracks)));
+       items.push_back (MenuElem (_("Show All Busses"), sigc::mem_fun (*this, &EditorRoutes::show_all_audiobus)));
+       items.push_back (MenuElem (_("Hide All Busses"), sigc::mem_fun (*this, &EditorRoutes::hide_all_audiobus)));
        items.push_back (MenuElem (_("Only Show Tracks with Regions Under Playhead"), sigc::mem_fun (*this, &EditorRoutes::show_tracks_with_regions_at_playhead)));
 }
 
@@ -1477,7 +1477,7 @@ EditorRoutes::initial_display ()
 {
 
        if (!_session) {
-               _model->clear ();
+               clear ();
                return;
        }
 
@@ -1486,16 +1486,7 @@ EditorRoutes::initial_display ()
 
        StripableList s;
 
-       RouteList r (*_session->get_routes());
-       for (RouteList::iterator ri = r.begin(); ri != r.end(); ++ri) {
-               s.push_back (*ri);
-       }
-
-       VCAList v (_session->vca_manager().vcas());
-       for (VCAList::iterator vi = v.begin(); vi != v.end(); ++vi) {
-               s.push_back (*vi);
-       }
-
+       _session->get_stripables (s);
        _editor->add_stripables (s);
 
        sync_treeview_from_presentation_info (Properties::order);
@@ -1782,7 +1773,7 @@ EditorRoutes::solo_changed_so_update_mute ()
 void
 EditorRoutes::show_tracks_with_regions_at_playhead ()
 {
-       boost::shared_ptr<RouteList> const r = _session->get_routes_with_regions_at (_session->transport_frame ());
+       boost::shared_ptr<RouteList> const r = _session->get_routes_with_regions_at (_session->transport_sample ());
 
        set<TimeAxisView*> show;
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {