smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

check for multiple tempo/meter marks at the same location, which somehow ardour2 allowed. don't handle it but at least report the error

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13082 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-07-25 13:12:25 +00:00
parent ce17c5727c
commit b18fbc8c68
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libs/ardour/tempo.cc
View file

@ -1012,6 +1012,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
*/
goto set_metrics;
}
}
}
@ -1645,6 +1646,28 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
metrics.sort (cmp);
}
/* check for multiple tempo/meters at the same location, which
ardour2 somehow allowed.
*/
Metrics::iterator prev = metrics.end();
for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
if (prev != metrics.end()) {
if (dynamic_cast<MeterSection*>(*prev) && dynamic_cast<MeterSection*>(*i)) {
if ((*prev)->start() == (*i)->start()) {
error << string_compose (_("Multiple meter definitions found at %1"), (*prev)->start()) << endmsg;
return -1;
}
} else if (dynamic_cast<TempoSection*>(*prev) && dynamic_cast<TempoSection*>(*i)) {
if ((*prev)->start() == (*i)->start()) {
error << string_compose (_("Multiple tempo definitions found at %1"), (*prev)->start()) << endmsg;
return -1;
}
}
}
prev = i;
}
recompute_map (true, -1);
}