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

change return type of Tempo::set_{ramped,clamped} and fix call sites

Browse source
This commit is contained in:
Paul Davis 2021-03-22 11:27:47 -06:00
parent 99c8c0b658
commit ce3fb0507c
3 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

26
gtk2_ardour/editor_markers.cc
View file

@ -1530,16 +1530,13 @@ Editor::toggle_tempo_clamped ()
XMLNode &before = tmap->get_state();
Temporal::Tempo & tempo (tm->tempo());
if (tempo.set_clamped (!tempo.clamped())) {
tempo.set_clamped (!tempo.clamped());
XMLNode &after = tmap->get_state();
_session->add_command (new MementoCommand<Temporal::TempoMap> (new Temporal::TempoMap::MementoBinder(), &before, &after));
commit_reversible_command ();
XMLNode &after = tmap->get_state();
_session->add_command (new MementoCommand<Temporal::TempoMap> (new Temporal::TempoMap::MementoBinder(), &before, &after));
commit_reversible_command ();
TempoMap::update (tmap);
} else {
abort_reversible_command ();
}
TempoMap::update (tmap);
}
}
@ -1558,15 +1555,12 @@ Editor::ramp_to_next_tempo ()
XMLNode &before = tmap->get_state();
Temporal::TempoPoint & tempo (tm->tempo());
if (tmap->set_ramped (tempo, !tempo.ramped())) {
XMLNode &after = tmap->get_state();
_session->add_command (new MementoCommand<Temporal::TempoMap> (new Temporal::TempoMap::MementoBinder(), &before, &after));
commit_reversible_command ();
tmap->set_ramped (tempo, !tempo.ramped());
XMLNode &after = tmap->get_state();
_session->add_command (new MementoCommand<Temporal::TempoMap> (new Temporal::TempoMap::MementoBinder(), &before, &after));
commit_reversible_command ();
TempoMap::update (tmap);
} else {
abort_reversible_command ();
}
TempoMap::update (tmap);
}
}