TempoMap legacy session loading fixes
authornick_m <mainsbridge@gmail.com>
Fri, 21 Jul 2017 15:54:24 +0000 (01:54 +1000)
committernick_m <mainsbridge@gmail.com>
Fri, 21 Jul 2017 16:15:20 +0000 (02:15 +1000)
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

index 4aaca6c3388fc22e9a236c6bde3debe5264dce62..1bddc749e72bd7592a1a5067165d476115ee05d5 100644 (file)
@@ -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&