summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_tempodisplay.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-10-07 18:05:35 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-10-07 18:05:35 +0000
commitd5391a986358479d94b99f7d9e4f3950a6dd4dd8 (patch)
tree33606e047e448aa691951903b12ea2d632856dc8 /gtk2_ardour/editor_tempodisplay.cc
parentff73f4e5e156569bb767313fbfa1ed2b579a6751 (diff)
Fix non-disappearing tracks when hiding, don't set colours twice initializing TimeAxisViewItems, remove some merge errors.
git-svn-id: svn://localhost/ardour2/branches/3.0@3878 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 0fc4e0560d..9e608521ed 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -158,9 +158,6 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
}
current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
-#ifdef GTKOSX
- lazy_hide_and_draw_measures ();
-#endif
}
void
@@ -185,10 +182,6 @@ Editor::draw_measures ()
return;
}
- if (current_bbt_points == 0 || current_bbt_points->empty()) {
- return;
- }
-
if (tempo_lines == 0) {
tempo_lines = new TempoLines(*track_canvas, time_line_group);
}