smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

fix(?) rulers for 3,5,7 divisions

Browse source
This commit is contained in:
Ben Loftis 2021-02-21 08:18:14 -06:00
parent 1fb5c443c7
commit 129e654500
1 changed files with 24 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

104
gtk2_ardour/editor_rulers.cc
View file

@ -1103,45 +1103,57 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
/* we can accent certain lines depending on the user's Grid choice */ /* we can accent certain lines depending on the user's Grid choice */
/* for example, even in a 4/4 meter we can draw a grid with triplet-feel */ /* for example, even in a 4/4 meter we can draw a grid with triplet-feel */
/* 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_accent_modulo = 2; uint32_t bbt_accent_modulo = 2;
switch (_grid_type) { switch (_grid_type) {
case GridTypeBeatDiv3:
bbt_divisor = 3;
bbt_accent_modulo = 3;
break;
case GridTypeBeatDiv5: case GridTypeBeatDiv5:
bbt_accent_modulo = 1; // XXX YIKES bbt_divisor = 5;
bbt_accent_modulo = 5;
break; break;
case GridTypeBeatDiv6: case GridTypeBeatDiv6:
bbt_divisor = 3;
bbt_accent_modulo = 3; bbt_accent_modulo = 3;
break; break;
case GridTypeBeatDiv7: case GridTypeBeatDiv7:
bbt_accent_modulo = 1; bbt_divisor = 7;
break; bbt_accent_modulo = 7;
case GridTypeBeatDiv8:
bbt_accent_modulo = 2;
break; break;
case GridTypeBeatDiv10: case GridTypeBeatDiv10:
bbt_divisor = 5;
bbt_accent_modulo = 5; bbt_accent_modulo = 5;
break; break;
case GridTypeBeatDiv12: case GridTypeBeatDiv12:
bbt_divisor = 3;
bbt_accent_modulo = 3; bbt_accent_modulo = 3;
break; break;
case GridTypeBeatDiv14: case GridTypeBeatDiv14:
bbt_divisor = 7;
bbt_accent_modulo = 7; bbt_accent_modulo = 7;
break; break;
case GridTypeBeatDiv16: case GridTypeBeatDiv16:
bbt_accent_modulo = 4; bbt_accent_modulo = 4;
break; break;
case GridTypeBeatDiv20: case GridTypeBeatDiv20:
bbt_divisor = 5;
bbt_accent_modulo = 5; bbt_accent_modulo = 5;
break; break;
case GridTypeBeatDiv24: case GridTypeBeatDiv24:
bbt_divisor = 6;
bbt_accent_modulo = 6; bbt_accent_modulo = 6;
break; break;
case GridTypeBeatDiv28: case GridTypeBeatDiv28:
bbt_divisor = 7;
bbt_accent_modulo = 7; bbt_accent_modulo = 7;
break; break;
case GridTypeBeatDiv32: case GridTypeBeatDiv32:
bbt_accent_modulo = 8; bbt_accent_modulo = 8;
break; break;
default: default:
bbt_divisor = 2;
bbt_accent_modulo = 2; bbt_accent_modulo = 2;
break; break;
} }
@ -1152,25 +1164,27 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
bbt_beat_subdivision = 1; bbt_beat_subdivision = 1;
break; break;
case bbt_show_eighths: case bbt_show_eighths:
bbt_beat_subdivision = 2; bbt_beat_subdivision = 1;
break; break;
case bbt_show_sixteenths: case bbt_show_sixteenths:
bbt_beat_subdivision = 4; bbt_beat_subdivision = 2;
break; break;
case bbt_show_thirtyseconds: case bbt_show_thirtyseconds:
bbt_beat_subdivision = 8; bbt_beat_subdivision = 4;
break; break;
case bbt_show_sixtyfourths: case bbt_show_sixtyfourths:
bbt_beat_subdivision = 16; bbt_beat_subdivision = 8;
break; break;
case bbt_show_onetwentyeighths: case bbt_show_onetwentyeighths:
bbt_beat_subdivision = 32; bbt_beat_subdivision = 16;
break; break;
default: default:
bbt_beat_subdivision = 1; bbt_beat_subdivision = 1;
break; break;
} }
bbt_beat_subdivision *= bbt_divisor;
switch (bbt_ruler_scale) { switch (bbt_ruler_scale) {
case bbt_show_many: case bbt_show_many:
@ -1307,76 +1321,6 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
break; break;
case bbt_show_eighths: case bbt_show_eighths:
beats = distance (grid.begin(), grid.end());
bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
// could do marks.assign() here to preallocate
mark.label = "";
mark.position = lower;
mark.style = ArdourCanvas::Ruler::Mark::Micro;
marks.push_back (mark);
for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) {
if ((*i).sample < lower && (bbt_bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
edit_last_mark_label (marks, buf);
helper_active = true;
} else {
if ((*i).is_bar()) {
mark.style = ArdourCanvas::Ruler::Mark::Major;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
} else {
mark.style = ArdourCanvas::Ruler::Mark::Minor;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat);
}
if (((*i).sample < bbt_position_of_helper) && helper_active) {
buf[0] = '\0';
}
mark.label = buf;
mark.position = (*i).sample;
marks.push_back (mark);
n++;
}
/* Add the tick marks */
skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision;
tick = skip; // the first non-beat tick
t = 0;
while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) {
next_beat.beats = (*i).beat;
next_beat.bars = (*i).bar;
next_beat.ticks = tick;
pos = _session->tempo_map().sample_at_bbt (next_beat);
if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
i_am_accented = true;
}
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;
case bbt_show_sixteenths: case bbt_show_sixteenths:
case bbt_show_thirtyseconds: case bbt_show_thirtyseconds:
case bbt_show_sixtyfourths: case bbt_show_sixtyfourths: