ardour/livetrax
13
0
Fork 0
Code

rulers: improve labelling of non-quarter note beats in tempo ruler

Browse Source
This commit is contained in:
Paul Davis 2022-11-29 09:45:03 -07:00
parent 8b06eb9878
commit cd86521c65
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor_rulers.cc
View File

@ -1180,6 +1180,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t l
/* and in this case you will want the accents on '3s' not '2s' */ /* and in this case you will want the accents on '3s' not '2s' */
uint32_t bbt_divisor = 2; uint32_t bbt_divisor = 2;
uint32_t bbt_accent_modulo = 2; uint32_t bbt_accent_modulo = 2;
switch (_grid_type) { switch (_grid_type) {
case GridTypeBeatDiv3: case GridTypeBeatDiv3:
bbt_divisor = 3; bbt_divisor = 3;
@ -1426,10 +1427,14 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t l
if (bbt.is_bar()) { if (bbt.is_bar()) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
snprintf (buf, sizeof(buf), "%" PRIu32, bbt.bars); snprintf (buf, sizeof(buf), "%" PRIu32, bbt.bars);
} else { } else if (bbt.ticks == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Minor; mark.style = ArdourCanvas::Ruler::Mark::Minor;
snprintf (buf, sizeof(buf), "%" PRIu32, bbt.beats); 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) { if (((*i).sample(sr) < bbt_position_of_helper) && helper_active) {
buf[0] = '\0'; buf[0] = '\0';
} }