ardour/livetrax
13
0
Fork 0
Code

fix mapping begin/commit/abort logic in editor

Browse Source
This commit is contained in:
Paul Davis 2023-03-11 20:50:05 -07:00
parent edca8209aa
commit 10b845b1ca
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_tempodisplay.cc
View File

@ -769,6 +769,7 @@ Editor::abort_tempo_mapping ()
delete domain_swap; /* undo the domain swap */ delete domain_swap; /* undo the domain swap */
domain_swap = 0; domain_swap = 0;
TempoMap::abort_update ();
TempoMap::SharedPtr tmap (TempoMap::fetch()); TempoMap::SharedPtr tmap (TempoMap::fetch());
reassociate_metric_markers (tmap); reassociate_metric_markers (tmap);
} }
@ -777,7 +778,10 @@ void
Editor::commit_tempo_mapping (TempoMap::WritableSharedPtr& new_map) Editor::commit_tempo_mapping (TempoMap::WritableSharedPtr& new_map)
{ {
TempoMap::update (new_map); TempoMap::update (new_map);
abort_tempo_mapping (); delete domain_swap; /* undo the domain swap */
domain_swap = 0;
TempoMap::SharedPtr tmap (TempoMap::fetch());
reassociate_metric_markers (tmap);
} }
Temporal::TempoMap::WritableSharedPtr Temporal::TempoMap::WritableSharedPtr