From 6309807bc77347ad2889a3e08fa2721ffa345194 Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Tue, 24 May 2016 04:17:35 +1000
Subject: Tempo ramps - rename for consistency, remove some testing code, add
 meter based bbt->pulse conversions.

---
 libs/ardour/region.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/ardour/region.cc')

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index ca178a9f7b..0ae709d99e 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1285,7 +1285,7 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c
 				    &bbt_time.ticks) != 3) {
 				_position_lock_style = AudioTime;
 			} else {
-				_beat = _session.tempo_map().bbt_to_beats (bbt_time);
+				_beat = _session.tempo_map().beat_at_bbt (bbt_time);
 			}
 		}
 	}
-- 
cgit v1.2.3