diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-02-25 05:09:16 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
| commit | ccb51a8ddbecd2fe3d6847d85b3a4ba1f55d3ef1 (patch) | |
| tree | 0dad2071b3da73ced18cfb75cc1ea0e40e1fc838 /gtk2_ardour/editor_markers.cc | |
| parent | dd72d2bf6584571b88fb383752dcb0dd892a034a (diff) | |
rework tempo editing.
most changes are due to a new design where tempo discontinuities at the
beginning of a ramped section may be set.
this allows easier mapping of live performance, especially in
the common case of a ramped ritard before the beginning of a new section.
feature summary:
holding constraint modifier (shift) while dragging the BBT ruler area
drags the tempo lines by changing the start tempo (as before)
holding copy modifier (control) while dragging the BBT ruler area
drags the tempo lines by changing the end tempo (ahem. not quite there)
dragging a tempo mark while holding constraint (shift) will change the
previous end tempo to match the marker position *worth trying*.
holding constraint and copy modifier (control + shift) while dragging
the BBT ruler area attempts to'pinch' or twist the surrounding tempi
sp that later ones are not repositioned (currently suffereng from
rounding errors)
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index bdc15f8dea..7918cec6cb 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1415,11 +1415,11 @@ Editor::toggle_marker_lock_style () } else if (tm) { TempoSection* tsp = &tm->tempo(); - const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); const TempoSection::Type type = tsp->type(); const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); begin_reversible_command (_("change tempo lock style")); XMLNode &before = _session->tempo_map().get_state(); @@ -1442,7 +1442,7 @@ Editor::toggle_tempo_type () if (tm) { TempoSection* tsp = &tm->tempo(); - const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp; |