ardour/livetrax
13
0
Fork 0
Code

Check for identical meter positions in old sessions by beat rather than pulse

Browse Source
This commit is contained in:
nick_m 2017-06-17 04:50:44 +10:00
parent 33c06fd3ca
commit b0a306f9d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/tempo.cc
View File

@ -4683,9 +4683,9 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
TempoSection* ts;
TempoSection* prev_t;
if ((prev_m = dynamic_cast<MeterSection*>(*prev)) != 0 && (ms = dynamic_cast<MeterSection*>(*i)) != 0) {
if (prev_m->pulse() == ms->pulse()) {
cerr << string_compose (_("Multiple meter definitions found at %1"), prev_m->pulse()) << endmsg;
error << string_compose (_("Multiple meter definitions found at %1"), prev_m->pulse()) << endmsg;
if (prev_m->beat() == ms->beat()) {
cerr << string_compose (_("Multiple meter definitions found at %1"), prev_m->beat()) << endmsg;
error << string_compose (_("Multiple meter definitions found at %1"), prev_m->beat()) << endmsg;
return -1;
}
} else if ((prev_t = dynamic_cast<TempoSection*>(*prev)) != 0 && (ts = dynamic_cast<TempoSection*>(*i)) != 0) {