From 8b06eb9878f437c18e7c6bd47749e6767e0437ab Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 29 Nov 2022 09:43:52 -0700 Subject: [PATCH] editor rulers: do not try to generate "fill" ticks/lines for the grid We now generate a grid from the TempoMap of appropriate "density". Doing this in the editor just gets things wrong (and partially duplicates the (complex) logic already present in the TempoMap). --- gtk2_ardour/editor_rulers.cc | 44 +----------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 46b1c75bc6..da0e1cefa8 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1438,51 +1438,9 @@ Editor::metric_get_bbt (std::vector& marks, int64_t l marks.push_back (mark); n++; } - - /* Add the tick marks */ - skip = Temporal::ticks_per_beat / bbt_beat_subdivision; - tick = skip; // the first non-beat tick - - t = 0; - while (tick < Temporal::ticks_per_beat && (n < bbt_nmarks)) { - - BBT_Time bbt ((*i).bbt()); - - next_beat.beats = bbt.beats; - next_beat.bars = bbt.bars; - next_beat.ticks = tick; - pos = TempoMap::use()->sample_at (next_beat); - - if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { - i_am_accented = true; - } - - /* We do not label these ticks marks, because - * we cannot be sure of their function. They - * could be sub-divisions of the time signature - * denominator, or they could actually be the - * time signature denominator points ("beats" - * in BBT). - */ - - mark.label = ""; - mark.position = pos; - - if ((bbt_beat_subdivision > 4) && i_am_accented) { - mark.style = ArdourCanvas::Ruler::Mark::Minor; - } else { - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - i_am_accented = false; - marks.push_back (mark); - - tick += skip; - ++t; - ++n; - } } - break; + break; } }