From a6727cace5aa4d4c8028d8170827b303a772a2e1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 15 Jan 2022 22:53:58 -0700 Subject: [PATCH] use new editor/tempo map editing API for tempo marker drag --- gtk2_ardour/editor_drag.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index c7d95938fc..0a5f4b1a9d 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3580,7 +3580,7 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) /* setup thread-local tempo map ptr as a writable copy */ - TempoMap::fetch_writable (); + _editor->begin_tempo_map_edit (); } } @@ -3682,6 +3682,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) timepos_t pos = adjusted_current_time (event); + std::cerr << " going to move " << &_marker->tempo() << std::endl; map->move_tempo (_marker->tempo(), pos, false); show_verbose_cursor_time (_marker->tempo().time()); @@ -3710,7 +3711,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) * official version */ - TempoMap::abort_update (); + _editor->abort_tempo_map_edit (); if (was_double_click()) { _editor->edit_tempo_marker (*_marker); @@ -3721,9 +3722,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) /* push the current state of our writable map copy */ - TempoMap::SharedPtr map (TempoMap::use()); - TempoMap::update (map); - + _editor->commit_tempo_map_edit (); XMLNode &after = TempoMap::use()->get_state(); _editor->session()->add_command (new MementoCommand (new Temporal::TempoMap::MementoBinder(), _before_state, &after)); @@ -3741,7 +3740,7 @@ TempoMarkerDrag::aborted (bool moved) * official version */ - TempoMap::abort_update (); + _editor->abort_tempo_map_edit (); // _point->end_float (); _marker->set_position (timepos_t (_marker->tempo().beats()));