diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-28 00:10:53 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-28 00:10:53 +1000 |
| commit | 78bec77c3e4deeffcb02da3e8de5b034705a6ebb (patch) | |
| tree | e5a84d45fc79feb5de73708251cd4974d9d6f229 /libs/ardour/ardour/tempo.h | |
| parent | bf96a74e96224f620105e8ec6a87361e15055c8c (diff) | |
Tempo ramps - fix merge conflicts, add bbt_at_frame_rt().
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 1 |
1 files changed, 1 insertions, 0 deletions
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); |