summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2017-07-22 01:54:24 +1000
committernick_m <mainsbridge@gmail.com>2017-07-22 02:15:20 +1000
commit886f4e6bc82cada82e8366b50aff87a993935da2 (patch)
tree24add69385ac40b4d33f16627fdd802ed72d195f
parente4e3c10a9084f77d077d963ac6d89d47daad2e66 (diff)
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.
-rw-r--r--libs/ardour/tempo.cc6
1 files changed, 5 insertions, 1 deletions
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&