From 78bec77c3e4deeffcb02da3e8de5b034705a6ebb Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 28 May 2016 00:10:53 +1000 Subject: Tempo ramps - fix merge conflicts, add bbt_at_frame_rt(). --- libs/ardour/ardour/tempo.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 4a2e5877b8..f190ba1185 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -422,6 +422,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible /* bbt - it's nearly always better to use beats.*/ Timecode::BBT_Time bbt_at_frame (framepos_t when); + Timecode::BBT_Time bbt_at_frame_rt (framepos_t when); framepos_t frame_at_bbt (const Timecode::BBT_Time&); double beat_at_bbt (const Timecode::BBT_Time& bbt); -- cgit v1.2.3