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

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 32cb6c67ee1a40d77bb566518f98c1de10615bfb..702490bc0d1aa9384ec6131502aa35184d239ceb 100644 (file)
--- 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) {