diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-03 22:15:10 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
| commit | 8b4f5dcd5f6a570ef920fe77c4dba5242726db5f (patch) | |
| tree | cdadb3cc9cd5161c071a1b472bd32ea2161697ec /libs/ardour/ardour/tempo.h | |
| parent | 992fc6b5102df03edeb3d33a3c2557b49532c0ae (diff) | |
Tempo ramps - reinstate cross-dragging of music-locked meters, various bug fixes.
- revert failed frameoffset_t experiment
- caclulate meters using bbt
- fix tempo dilation when first tempo is ramped.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 87023e0cd8..889fde3e99 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -199,8 +199,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { bool locked_to_meter () const { return _locked_to_meter; } void set_locked_to_meter (bool yn) { _locked_to_meter = yn; } - double tempo_at_frame (const frameoffset_t& frame, const framecnt_t& frame_rate) const; - frameoffset_t frame_at_tempo (const double& ppm, const double& beat, const framecnt_t& frame_rate) const; + double tempo_at_frame (const framepos_t& frame, const framecnt_t& frame_rate) const; + framepos_t frame_at_tempo (const double& ppm, const double& beat, const framecnt_t& frame_rate) const; double tempo_at_pulse (const double& pulse) const; double pulse_at_tempo (const double& ppm, const framepos_t& frame, const framecnt_t& frame_rate) const; @@ -215,8 +215,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { private: - frameoffset_t minute_to_frame (const double& time, const framecnt_t& frame_rate) const; - double frame_to_minute (const frameoffset_t& frame, const framecnt_t& frame_rate) const; + framepos_t minute_to_frame (const double& time, const framecnt_t& frame_rate) const; + double frame_to_minute (const framepos_t& frame, const framecnt_t& frame_rate) const; /* tempo ramp functions. zero-based with time in minutes, * 'tick tempo' in ticks per minute and tempo in bpm. |