diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-06-17 04:50:44 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-07-22 02:15:20 +1000 |
| commit | b0a306f9d0ba5d47dadba1130d68d25bc078c52e (patch) | |
| tree | 30825591d75f4792e83fa601e9a90d6c33e35a06 /libs/ardour/tempo.cc | |
| parent | 33c06fd3ca3519e1322a4d5e6b3ca8339fe7e7a2 (diff) | |
Check for identical meter positions in old sessions by beat rather than pulse
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 32cb6c67ee..702490bc0d 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -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) { |