From 62bcaf2191a2c7b8170e9b7925a809fed493f503 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 23 May 2022 16:33:27 -0600 Subject: [PATCH] for now (at least) do not show tempo/meter markers for MusicTimePoints This policy may change in the future --- gtk2_ardour/editor_tempodisplay.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index e7affd37b3..8b8904d7e5 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -229,9 +229,14 @@ Editor::draw_tempo_marks () while (t != tempi.end() && mm != tempo_marks.end()) { - Temporal::Point const & mark_point ((*mm)->point()); Temporal::TempoPoint const & metric_point (*t); + if (dynamic_cast (&metric_point)) { + continue; + } + + Temporal::Point const & mark_point ((*mm)->point()); + if (mark_point.sclock() < metric_point.sclock()) { /* advance through markers, deleting the unused ones */ @@ -292,9 +297,14 @@ Editor::draw_meter_marks () while (m != meters.end() && mm != meter_marks.end()) { - Temporal::Point const & mark_point ((*mm)->point()); Temporal::MeterPoint const & metric_point (*m); + if (dynamic_cast (&metric_point)) { + continue; + } + + Temporal::Point const & mark_point ((*mm)->point()); + if (mark_point.sclock() < metric_point.sclock()) { /* advance through markers, deleting the unused ones */