From 886f4e6bc82cada82e8366b50aff87a993935da2 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 22 Jul 2017 01:54:24 +1000 Subject: TempoMap legacy session loading fixes Ensure we set the last tempo end note types per minute. Clarify that we only set the end ntpm if unset. --- libs/ardour/tempo.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/ardour') diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 4aaca6c338..1bddc749e7 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -4531,7 +4531,7 @@ TempoMap::fix_legacy_end_session () } if (prev_t) { - if (prev_t->type() != TempoSection::Constant) { + if (prev_t->end_note_types_per_minute() < 0.0) { prev_t->set_end_note_types_per_minute (t->note_types_per_minute()); } } @@ -4539,6 +4539,10 @@ TempoMap::fix_legacy_end_session () prev_t = t; } } + + if (prev_t) { + prev_t->set_end_note_types_per_minute (prev_t->note_types_per_minute()); + } } XMLNode& -- cgit v1.2.3