ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove public ::bbt_at (INTEGER) methods, because of superclock_t/samplepos_t confusion (GUI edition)

Browse Source
This commit is contained in:
Paul Davis 2021-03-25 10:24:20 -06:00
parent 8bada4b5e1
commit 36609c4067
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/audio_clock.cc
View File

@ -1246,10 +1246,10 @@ AudioClock::set_bbt (timepos_t const & w, timecnt_t const & o, bool /*force*/)
Temporal::BBT_Time sub_bbt; Temporal::BBT_Time sub_bbt;
if (negative) { if (negative) {
BBT = tmap->bbt_at (tmap->quarters_at (timepos_t (offset))); BBT = tmap->bbt_at (timepos_t (tmap->quarters_at (timepos_t (offset))));
sub_bbt = tmap->bbt_at (timepos_t (offset - when)); sub_bbt = tmap->bbt_at (timepos_t (offset - when));
} else { } else {
BBT = tmap->bbt_at (tmap->quarters_at (when + offset)); BBT = tmap->bbt_at (timepos_t (tmap->quarters_at (when + offset)));
sub_bbt = tmap->bbt_at (timepos_t (offset)); sub_bbt = tmap->bbt_at (timepos_t (offset));
} }

2
gtk2_ardour/editor_audio_import.cc
View File

@ -316,7 +316,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, timepos_t const & pos)
if (have_initial_meter) { if (have_initial_meter) {
bbt = new_map->bbt_at (Temporal::Beats (int_div_round (t->time_pulses * 4, (size_t) smf.ppqn()), 0)); bbt = new_map->bbt_at (timepos_t (Temporal::Beats (int_div_round (t->time_pulses * 4, (size_t) smf.ppqn()), 0)));
new_map->set_tempo (tempo, bbt); new_map->set_tempo (tempo, bbt);
if (!(meter == last_meter)) { if (!(meter == last_meter)) {

2
gtk2_ardour/editor_regions.cc
View File

@ -617,7 +617,7 @@ EditorRegions::format_position (timepos_t const & p, char* buf, size_t bufsize,
switch (ARDOUR_UI::instance ()->primary_clock->mode ()) { switch (ARDOUR_UI::instance ()->primary_clock->mode ()) {
case AudioClock::BBT: case AudioClock::BBT:
bbt = Temporal::TempoMap::use()->bbt_at (pos); bbt = Temporal::TempoMap::use()->bbt_at (p);
if (onoff) { if (onoff) {
snprintf (buf, bufsize, "%03d|%02d|%04d", bbt.bars, bbt.beats, bbt.ticks); snprintf (buf, bufsize, "%03d|%02d|%04d", bbt.bars, bbt.beats, bbt.ticks);
} else { } else {

2
gtk2_ardour/mini_timeline.cc
View File

@ -273,7 +273,7 @@ MiniTimeline::format_time (samplepos_t when)
case AudioClock::BBT: case AudioClock::BBT:
{ {
char buf[64]; char buf[64];
Temporal::BBT_Time BBT = Temporal::TempoMap::use()->bbt_at (when); Temporal::BBT_Time BBT = Temporal::TempoMap::use()->bbt_at (timepos_t (when));
snprintf (buf, sizeof (buf), "%03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32, snprintf (buf, sizeof (buf), "%03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32,
BBT.bars, BBT.beats, BBT.ticks); BBT.bars, BBT.beats, BBT.ticks);
_layout->set_text (buf); _layout->set_text (buf);