summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-06-28 14:32:26 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-06-28 14:32:26 +0000
commit958c63bd186c23192f61b47de602abbd5b8d87f4 (patch)
treed23a527894ef62d742805f69d4994f186e37215c /gtk2_ardour
parentf46a7bc509d432752dc4ac66e3aa78bd0d19b00a (diff)
minor cleanups from 12952
git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/editor_routes.cc23
-rw-r--r--gtk2_ardour/editor_routes.h1
3 files changed, 1 insertions, 25 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f33dda2dac..4cc4f6b6d6 100644
--- 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 94e3803577..eaf0c2500a 100644
--- 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 cbe9825cb5..008304303f 100644
--- 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: