ardour/livetrax
13
0
Fork 0
Code

editor rulers: do not try to generate "fill" ticks/lines for the grid

Browse Source 
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).
This commit is contained in:
Paul Davis 2022-11-29 09:43:52 -07:00
parent e3dc0a24f2
commit 8b06eb9878
1 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk2_ardour/editor_rulers.cc
View File

@ -1438,48 +1438,6 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& 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;