summaryrefslogtreecommitdiff
path: root/libs/ardour/region.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-05-24 04:17:35 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:17 +1000
commit6309807bc77347ad2889a3e08fa2721ffa345194 (patch)
tree48acdc99a4aeacfd675e71557c7d67c2d5842994 /libs/ardour/region.cc
parentf54b75c869348501a4603bfe7adce46b50781b5b (diff)
Tempo ramps - rename for consistency, remove some testing code, add meter based bbt->pulse conversions.
Diffstat (limited to 'libs/ardour/region.cc')
-rw-r--r--libs/ardour/region.cc2
1 files changed, 1 insertions, 1 deletions
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);
}
}
}