smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

fix incorrect design of abort-tempo-map-edit operation

Browse source
This commit is contained in:
Paul Davis 2023-09-11 10:22:26 -06:00
parent 4eb58e104c
commit fa78fe1f33
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor_drag.cc
View file

@ -3340,14 +3340,6 @@ TempoMarkerDrag::aborted (bool moved)
*/ */
_editor->abort_tempo_map_edit (); _editor->abort_tempo_map_edit ();
// _point->end_float ();
_marker->set_position (timepos_t (_marker->tempo ().beats ()));
if (moved) {
// delete the dummy (hidden) marker we used for events while moving.
delete _marker;
}
} }
/********* */ /********* */

7
gtk2_ardour/editor_tempodisplay.cc
View file

@ -847,12 +847,7 @@ Editor::abort_tempo_map_edit ()
{ {
/* this drops the lock held while we have a writable copy in our per-thread pointer */ /* this drops the lock held while we have a writable copy in our per-thread pointer */
TempoMap::abort_update (); TempoMap::abort_update ();
tempo_map_changed ();
/* Now update our own per-thread copy of the tempo map pointer to be
the canonical one, and reconnect markers with elements of that map
*/
TempoMap::SharedPtr tmap (TempoMap::fetch());
reassociate_metric_markers (tmap);
} }
void void