Sort tempo map after legacy sections have been assigned a pulse
This commit is contained in:
@@ -4640,11 +4640,6 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
|
||||
}
|
||||
}
|
||||
|
||||
if (niter == nlist.end()) {
|
||||
MetricSectionSorter cmp;
|
||||
_metrics.sort (cmp);
|
||||
}
|
||||
|
||||
/* check for legacy sessions where bbt was the base musical unit for tempo */
|
||||
for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) {
|
||||
TempoSection* t;
|
||||
@@ -4663,6 +4658,11 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
|
||||
}
|
||||
}
|
||||
|
||||
if (niter == nlist.end()) {
|
||||
MetricSectionSorter cmp;
|
||||
_metrics.sort (cmp);
|
||||
}
|
||||
|
||||
/* check for multiple tempo/meters at the same location, which
|
||||
ardour2 somehow allowed.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user