From 5f3ad2cde95a47a63032fcb40ffc08845be5c371 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 26 Mar 2021 21:15:27 -0600 Subject: [PATCH] follow new const requirements associated with Meter/Tempo --- gtk2_ardour/editor_actions.cc | 4 ++-- gtk2_ardour/main_clock.cc | 4 ++-- gtk2_ardour/tempo_dialog.cc | 4 ++-- gtk2_ardour/verbose_cursor.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index eef7b8670d..49c82a5b1e 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -1042,13 +1042,13 @@ Editor::set_xjadeo_viewoption (int what) void Editor::edit_current_meter () { - edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).meter()); + edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_meter()); } void Editor::edit_current_tempo () { - edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).tempo()); + edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_tempo()); } RefPtr diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index 7687b5f01e..5713c48de7 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -150,14 +150,14 @@ void MainClock::edit_current_tempo () { if (!PublicEditor::instance().session()) return; - PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->tempo_at (absolute_time())); + PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_tempo()); } void MainClock::edit_current_meter () { if (!PublicEditor::instance().session()) return; - PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->meter_at (absolute_time())); + PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_meter()); } void diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 684109652f..4a023e38b6 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -59,7 +59,7 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, timepos_t const & pos , tap_tempo_button (_("Tap tempo")) { Temporal::BBT_Time when (_map->bbt_at (pos)); - Tempo& tempo (_map->tempo_at (pos)); + Tempo const & tempo (_map->tempo_at (pos)); init (when, tempo.note_types_per_minute(), tempo.end_note_types_per_minute(), tempo.note_type(), Tempo::Constant, true, BeatTime); } @@ -490,7 +490,7 @@ MeterDialog::MeterDialog (TempoMap::SharedPtr const & map, timepos_t const & pos : ArdourDialog (_("New Meter")) { Temporal::BBT_Time when (map->round_to_bar (map->bbt_at (pos))); - Meter& meter (map->meter_at (when)); + Meter const & meter (map->meter_at (when)); init (when, meter.divisions_per_bar(), meter.note_value(), false, pos.time_domain()); } diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc index ae5db419c0..d8a22b682c 100644 --- a/gtk2_ardour/verbose_cursor.cc +++ b/gtk2_ardour/verbose_cursor.cc @@ -145,7 +145,7 @@ VerboseCursor::set_duration (samplepos_t start, samplepos_t end) Timecode::Time timecode; Temporal::BBT_Time sbbt; Temporal::BBT_Time ebbt; - Meter& meter_at_start (TempoMap::use()->metric_at (start).meter()); + Meter const & meter_at_start (TempoMap::use()->metric_at (start).meter()); if (_editor->_session == 0) { return;