ardour/livetrax
13
0
Fork 0
Code

minor cleanups to timecode metric generation code

Browse Source 
Mostly this is to make sure that we never include marks earlier than @param lower.
The sample->timecode conversion common to all rule scales is now moved outside
of the switch block, and an unnecessary floor() call was removed.
This commit is contained in:
Paul Davis 2024-05-24 11:03:34 -06:00
parent 50a0f40a0f
commit e9013e1d0f
1 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk2_ardour/editor_rulers.cc
View File

@ -927,7 +927,7 @@ Editor::set_timecode_ruler_scale (samplepos_t lower, samplepos_t upper)
} }
void void
Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t lower, int64_t /*upper*/, gint /*maxchars*/) Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int64_t lower, int64_t upper, gint /*maxchars*/)
{ {
samplepos_t pos; samplepos_t pos;
samplecnt_t spacer; samplecnt_t spacer;
@ -946,14 +946,16 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
lower = 0; lower = 0;
} }
pos = (samplecnt_t) floor (lower); pos = lower;
// Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
switch (timecode_ruler_scale) { switch (timecode_ruler_scale) {
case timecode_show_bits: case timecode_show_bits:
// Find timecode time of this sample (pos) with subframe accuracy // Find timecode time of this sample (pos) with subframe accuracy
_session->sample_to_timecode(pos, timecode, true /* use_offset */, true /* use_subframes */);
for (n = 0; n < timecode_nmarks; n++) { for (n = 0; n < timecode_nmarks; n++) {
_session->timecode_to_sample(timecode, pos, true /* use_offset */, true /* use_subframes */); _session->timecode_to_sample(timecode, pos, true /* use_offset */, true /* use_subframes */);
if (pos >= lower) {
if ((timecode.subframes % timecode_mark_modulo) == 0) { if ((timecode.subframes % timecode_mark_modulo) == 0) {
if (timecode.subframes == 0) { if (timecode.subframes == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
@ -969,18 +971,18 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
mark.label = buf; mark.label = buf;
mark.position = pos; mark.position = pos;
marks.push_back (mark); marks.push_back (mark);
}
// Increment subframes by one // Increment subframes by one
Timecode::increment_subframes (timecode, _session->config.get_subframes_per_frame()); Timecode::increment_subframes (timecode, _session->config.get_subframes_per_frame());
} }
break; break;
case timecode_show_samples: case timecode_show_samples:
// Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
// Go to next whole sample down // Go to next whole sample down
Timecode::frames_floot (timecode); Timecode::frames_floot (timecode);
for (n = 0; n < timecode_nmarks; n++) { for (n = 0; n < timecode_nmarks; n++) {
_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
if (pos >= lower) {
if ((timecode.frames % timecode_mark_modulo) == 0) { if ((timecode.frames % timecode_mark_modulo) == 0) {
if (timecode.frames == 0) { if (timecode.frames == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
@ -996,17 +998,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
} }
mark.label = buf; mark.label = buf;
marks.push_back (mark); marks.push_back (mark);
}
Timecode::increment (timecode, _session->config.get_subframes_per_frame()); Timecode::increment (timecode, _session->config.get_subframes_per_frame());
} }
break; break;
case timecode_show_seconds: case timecode_show_seconds:
// Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
// Go to next whole second down // Go to next whole second down
Timecode::seconds_floor (timecode); Timecode::seconds_floor (timecode);
for (n = 0; n < timecode_nmarks; n++) { for (n = 0; n < timecode_nmarks; n++) {
_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
if (pos >= lower) {
if ((timecode.seconds % timecode_mark_modulo) == 0) { if ((timecode.seconds % timecode_mark_modulo) == 0) {
if (timecode.seconds == 0) { if (timecode.seconds == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
@ -1023,17 +1025,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
} }
mark.label = buf; mark.label = buf;
marks.push_back (mark); marks.push_back (mark);
}
Timecode::increment_seconds (timecode, _session->config.get_subframes_per_frame()); Timecode::increment_seconds (timecode, _session->config.get_subframes_per_frame());
} }
break; break;
case timecode_show_minutes: case timecode_show_minutes:
//Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
// Go to next whole minute down // Go to next whole minute down
Timecode::minutes_floor (timecode); Timecode::minutes_floor (timecode);
for (n = 0; n < timecode_nmarks; n++) { for (n = 0; n < timecode_nmarks; n++) {
_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
if (pos >= lower) {
if ((timecode.minutes % timecode_mark_modulo) == 0) { if ((timecode.minutes % timecode_mark_modulo) == 0) {
if (timecode.minutes == 0) { if (timecode.minutes == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
@ -1048,16 +1050,16 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
mark.label = buf; mark.label = buf;
mark.position = pos; mark.position = pos;
marks.push_back (mark); marks.push_back (mark);
}
Timecode::increment_minutes (timecode, _session->config.get_subframes_per_frame()); Timecode::increment_minutes (timecode, _session->config.get_subframes_per_frame());
} }
break; break;
case timecode_show_hours: case timecode_show_hours:
// Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
// Go to next whole hour down // Go to next whole hour down
Timecode::hours_floor (timecode); Timecode::hours_floor (timecode);
for (n = 0; n < timecode_nmarks; n++) { for (n = 0; n < timecode_nmarks; n++) {
_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
if (pos >= lower) {
if ((timecode.hours % timecode_mark_modulo) == 0) { if ((timecode.hours % timecode_mark_modulo) == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
@ -1068,17 +1070,17 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
mark.label = buf; mark.label = buf;
mark.position = pos; mark.position = pos;
marks.push_back (mark); marks.push_back (mark);
}
Timecode::increment_hours (timecode, _session->config.get_subframes_per_frame()); Timecode::increment_hours (timecode, _session->config.get_subframes_per_frame());
} }
break; break;
case timecode_show_many_hours: case timecode_show_many_hours:
// Find timecode time of this sample (pos)
_session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */);
// Go to next whole hour down // Go to next whole hour down
Timecode::hours_floor (timecode); Timecode::hours_floor (timecode);
for (n = 0; n < timecode_nmarks;) { for (n = 0; n < timecode_nmarks;) {
_session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */);
if (pos >= lower) {
if ((timecode.hours % timecode_mark_modulo) == 0) { if ((timecode.hours % timecode_mark_modulo) == 0) {
mark.style = ArdourCanvas::Ruler::Mark::Major; mark.style = ArdourCanvas::Ruler::Mark::Major;
snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
@ -1087,6 +1089,7 @@ Editor::metric_get_timecode (std::vector<ArdourCanvas::Ruler::Mark>& marks, int6
marks.push_back (mark); marks.push_back (mark);
++n; ++n;
} }
}
/* can't use Timecode::increment_hours() here because we may be traversing thousands of hours /* can't use Timecode::increment_hours() here because we may be traversing thousands of hours
* and doing it 1 hour at a time is just stupid (and slow). * and doing it 1 hour at a time is just stupid (and slow).
*/ */