From 66dde32a1b718d837fa3b2899570a066ca80c04f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 19 Aug 2025 07:59:23 -0600 Subject: [PATCH] no more BBT_Time round/round_up methods (GUI edition) --- gtk2_ardour/bbt_marker_dialog.cc | 2 +- gtk2_ardour/editor_mouse.cc | 12 +++--------- gtk2_ardour/step_editor.cc | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/bbt_marker_dialog.cc b/gtk2_ardour/bbt_marker_dialog.cc index dcf9f8a3eb..a6caa2a077 100644 --- a/gtk2_ardour/bbt_marker_dialog.cc +++ b/gtk2_ardour/bbt_marker_dialog.cc @@ -46,7 +46,7 @@ BBTMarkerDialog::BBTMarkerDialog (MusicTimePoint& p) : ArdourDialog (_("Edit Music Time")) , _point (&p) , _position (timepos_t::from_superclock (p.sclock())) - , _bbt (TempoMap::use()->bbt_at (_position).round_to_beat ()) + , _bbt (TempoMap::use()->meter_at (_position).round_to_beat (TempoMap::use()->bbt_at (_position))) , bar_label (_("Bar")) , beat_label (_("Beat")) , name_label (_("Name")) diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 09d956b624..f0b62e4568 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2480,7 +2480,7 @@ Editor::choose_mapping_drag (ArdourCanvas::Item* item, GdkEvent* event) */ timepos_t pointer_time (canvas_event_sample (event, nullptr, nullptr)); - Temporal::TempoPoint& tempo = const_cast(map->tempo_at (pointer_time)); + TempoPoint& tempo = const_cast(map->tempo_at (pointer_time)); TempoPoint* before = const_cast (map->previous_tempo (tempo)); TempoPoint* after = const_cast (map->next_tempo (tempo)); @@ -2494,14 +2494,8 @@ Editor::choose_mapping_drag (ArdourCanvas::Item* item, GdkEvent* event) } BBT_Argument bbt = map->bbt_at (pointer_time); - bbt = BBT_Argument (bbt.reference(), bbt.round_to_beat ()); - - /* BBT_Argument is meter-agnostic so we need to use the map's meter to resolve bar boundaries */ - const Meter& m = map->meter_at (pointer_time); - if (bbt.beats > m.divisions_per_bar()){ - bbt.beats = 1; - bbt.bars++; - } + Meter const & m = map->meter_at (pointer_time); + bbt = BBT_Argument (bbt.reference(), m.round_to_beat (bbt)); /* Create a new marker, or use the one under the mouse */ diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index d1349a4599..2a53c8a490 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -428,7 +428,7 @@ StepEditor::step_edit_bar_sync () /* have to go to BBT to round up to bar, unfortunately */ TempoMap::SharedPtr tmap (TempoMap::use()); - BBT_Argument bbt (tmap->bbt_at (pos).round_up_to_bar ()); + BBT_Argument bbt (tmap->meter_at (pos).round_up_to_bar (tmap->bbt_at (pos))); /* now back to beats */ pos = timepos_t (tmap->quarters_at (bbt));