From 36609c4067e9711742c061b213177aa68b6f1554 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 25 Mar 2021 10:24:20 -0600 Subject: [PATCH] remove public ::bbt_at (INTEGER) methods, because of superclock_t/samplepos_t confusion (GUI edition) --- gtk2_ardour/audio_clock.cc | 4 ++-- gtk2_ardour/editor_audio_import.cc | 2 +- gtk2_ardour/editor_regions.cc | 2 +- gtk2_ardour/mini_timeline.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 8edb5d7ef2..9fb3901d88 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1246,10 +1246,10 @@ AudioClock::set_bbt (timepos_t const & w, timecnt_t const & o, bool /*force*/) Temporal::BBT_Time sub_bbt; 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)); } 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)); } diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index a654328050..79e824acaa 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -316,7 +316,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, timepos_t const & pos) 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); if (!(meter == last_meter)) { diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index a60a70e2d0..b7c37779bc 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -617,7 +617,7 @@ EditorRegions::format_position (timepos_t const & p, char* buf, size_t bufsize, switch (ARDOUR_UI::instance ()->primary_clock->mode ()) { case AudioClock::BBT: - bbt = Temporal::TempoMap::use()->bbt_at (pos); + bbt = Temporal::TempoMap::use()->bbt_at (p); if (onoff) { snprintf (buf, bufsize, "%03d|%02d|%04d", bbt.bars, bbt.beats, bbt.ticks); } else { diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc index b3f4a86a4f..f9f5cd6a6d 100644 --- a/gtk2_ardour/mini_timeline.cc +++ b/gtk2_ardour/mini_timeline.cc @@ -273,7 +273,7 @@ MiniTimeline::format_time (samplepos_t when) case AudioClock::BBT: { 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, BBT.bars, BBT.beats, BBT.ticks); _layout->set_text (buf);