From b0a306f9d0ba5d47dadba1130d68d25bc078c52e Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 17 Jun 2017 04:50:44 +1000 Subject: Check for identical meter positions in old sessions by beat rather than pulse --- libs/ardour/tempo.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/ardour') 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(*prev)) != 0 && (ms = dynamic_cast(*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(*prev)) != 0 && (ts = dynamic_cast(*i)) != 0) { -- cgit v1.2.3