minor cleanups from 12952

git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f33dda2dac7a79c52e66cb7777983eced2ac5464..4cc4f6b6d6ce1d3627aa9549314b0b946d0ee9f5 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4796,7 +4796,7 @@ Editor::add_routes (RouteList& routes)
        for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                boost::shared_ptr<Route> route = (*x);
 
-               if (route->is_hidden()) {
+               if (route->is_hidden() || route->is_monitor()) {
                        continue;
                }
 

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 94e3803577a40b04889f4534e3c79039dd355ffb..eaf0c2500aedc853b2e194ef81f5be885914d30f 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -1595,26 +1595,3 @@ EditorRoutes::show_tracks_with_regions_at_playhead ()
        resume_redisplay ();
 }
 
-uint32_t
-EditorRoutes::count_displayed_non_special_routes () const
-{
-       if (!_model) {
-               return 0;
-       }
-       uint32_t cnt = 0;
-       TreeModel::Children rows = _model->children ();
-       for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
-               bool visible = (*i)[_columns.visible];
-               if (visible) {
-                       boost::shared_ptr<Route> route = (*i)[_columns.route];
-                       if (route) {
-                               if (route->is_master() || route->is_monitor()) {
-                                       continue;
-                               }
-                               cnt++;
-                       }
-               }
-       }
-
-       return cnt;
-}

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index cbe9825cb56369be2e6083c659d515b0ae5f5a70..008304303f5bc879ab2d51ebc7b86f76d232516d 100644 (file)
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -59,7 +59,6 @@ public:
        std::list<TimeAxisView*> views () const;
        void hide_all_tracks (bool);
        void clear ();
-        uint32_t count_displayed_non_special_routes () const;
         void sync_order_keys_from_model ();
 private: