From cd86521c65b4ea5ee88858fff971bca36453d145 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 29 Nov 2022 09:45:03 -0700 Subject: [PATCH] rulers: improve labelling of non-quarter note beats in tempo ruler --- gtk2_ardour/editor_rulers.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index da0e1cefa8..7156d60c30 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1180,6 +1180,7 @@ Editor::metric_get_bbt (std::vector& marks, int64_t l /* and in this case you will want the accents on '3s' not '2s' */ uint32_t bbt_divisor = 2; uint32_t bbt_accent_modulo = 2; + switch (_grid_type) { case GridTypeBeatDiv3: bbt_divisor = 3; @@ -1426,10 +1427,14 @@ Editor::metric_get_bbt (std::vector& marks, int64_t l if (bbt.is_bar()) { mark.style = ArdourCanvas::Ruler::Mark::Major; snprintf (buf, sizeof(buf), "%" PRIu32, bbt.bars); - } else { + } else if (bbt.ticks == 0) { mark.style = ArdourCanvas::Ruler::Mark::Minor; snprintf (buf, sizeof(buf), "%" PRIu32, bbt.beats); + } else { + mark.style = ArdourCanvas::Ruler::Mark::Micro; + buf[0] = '\0'; } + if (((*i).sample(sr) < bbt_position_of_helper) && helper_active) { buf[0] = '\0'; }