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

merge fix again

Browse source
This commit is contained in:
Ben Loftis 2015-07-16 17:14:14 -05:00
parent 46c8369328
commit 9673e6b271
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_ops.cc
View file

@ -7421,9 +7421,9 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
if (tempo_too) { if (tempo_too) {
XMLNode& before (_session->tempo_map().get_state()); XMLNode& before (_session->tempo_map().get_state());
if (_session->tempo_map().cut_time (pos, frames) ) { if (_session->tempo_map().remove_time (pos, frames) ) {
if (!in_command) { if (!in_command) {
begin_reversible_command (_("cut time")); begin_reversible_command (_("remove time"));
in_command = true; in_command = true;
} }
XMLNode& after (_session->tempo_map().get_state()); XMLNode& after (_session->tempo_map().get_state());