diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-02 03:19:21 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | 38df1063d3c6423dc3eda3f7d5f20a5dc6b57e45 (patch) | |
| tree | 1205b4b333630d3783aa40143d401bd1f98e74fc /libs/ardour/ardour/tempo.h | |
| parent | 77abc08d6f28ee657aa8dfdb36fd9acc91a1e4b7 (diff) | |
Tempo ramps - re-enabe audio-locked meter sections, fix more locking errors.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 1842e1a902..4396cb8f99 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -327,9 +327,6 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void bbt_time (framepos_t when, Timecode::BBT_Time&); - double tick_at_frame (framecnt_t frame) const; - framecnt_t frame_at_tick (double tick) const; - double beat_at_frame (framecnt_t frame) const; framecnt_t frame_at_beat (double beat) const; @@ -421,6 +418,10 @@ private: Timecode::BBT_Time beats_to_bbt_locked (double beats); double beat_at_frame_locked (framecnt_t frame) const; framecnt_t frame_at_beat_locked (double beat) const; + double tick_at_frame_locked (framecnt_t frame) const; + framecnt_t frame_at_tick_locked (double tick) const; + framepos_t frame_time_locked (const Timecode::BBT_Time&); + friend class ::BBTTest; friend class ::FrameposPlusBeatsTest; friend class ::TempoTest; |