diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-04-16 06:29:15 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:15 +1000 |
| commit | eb70cdce1f7feeac76d2b87bf140d62e666489f5 (patch) | |
| tree | 0ce8a8278176e3a5c07261da26af90f313d687a7 /gtk2_ardour/editor_markers.cc | |
| parent | 71a90399fe8561310b848fbfb8d28a65a395a6c1 (diff) | |
Tempo ramps - don't set incorrect lock style when changing tempo type.
- fixes random crashes when changing tempo type with right click.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 194d6163e7..c597ec292d 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1390,7 +1390,6 @@ Editor::toggle_marker_lock_style () if (mm) { MeterSection* msp = &mm->meter(); - if (mm->meter().position_lock_style() == AudioTime) { _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt()); } else { @@ -1415,11 +1414,9 @@ Editor::toggle_tempo_type () if (tm) { TempoSection* tsp = &tm->tempo(); - if (tm->tempo().type() == TempoSection::Constant) { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), TempoSection::Ramp); - } else { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), TempoSection::Constant); - } + _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()) + , (tsp->position_lock_style() == MusicTime) ? tsp->pulse() : tsp->frame() + , (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp); } } |