ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - fix comments.

Browse Source
This commit is contained in:
nick_m 2016-03-04 02:30:50 +11:00
parent 8225d7cc6f
commit 9a766c56f9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/tempo.cc
View File

@ -216,7 +216,9 @@ TempoSection::tempo_at_frame (framepos_t f, framecnt_t frame_rate) const
} }
/** returns the zero-based frame (relative to session) /** returns the zero-based frame (relative to session)
where the tempo occurs in this section. note that the tempo map may have multiple such values. where the tempo occurs in this section.
beat b is only used for constant tempos.
note that the tempo map may have multiple such values.
*/ */
framepos_t framepos_t
TempoSection::frame_at_tempo (double bpm, double b, framecnt_t frame_rate) const TempoSection::frame_at_tempo (double bpm, double b, framecnt_t frame_rate) const
@ -227,7 +229,7 @@ TempoSection::frame_at_tempo (double bpm, double b, framecnt_t frame_rate) const
return minute_to_frame (time_at_tick_tempo (bpm * BBT_Time::ticks_per_beat), frame_rate) + frame(); return minute_to_frame (time_at_tick_tempo (bpm * BBT_Time::ticks_per_beat), frame_rate) + frame();
} }
/** returns the tempo at the zero-based (relative to session) frame. /** returns the tempo at the zero-based (relative to session) beat.
*/ */
double double
TempoSection::tempo_at_beat (double b) const TempoSection::tempo_at_beat (double b) const
@ -240,8 +242,9 @@ TempoSection::tempo_at_beat (double b) const
return tick_tempo_at_tick ((b - beat()) * BBT_Time::ticks_per_beat) / BBT_Time::ticks_per_beat; return tick_tempo_at_tick ((b - beat()) * BBT_Time::ticks_per_beat) / BBT_Time::ticks_per_beat;
} }
/** returns the zero-based frame (relative to session) /** returns the zero-based beat (relative to session)
where the tempo occurs in this section. note that the tempo map may have multiple such values. where the tempo occurs given frame f. frame f is only used for constant tempos.
note that the session tempo map may have multiple beats at a given tempo.
*/ */
double double
TempoSection::beat_at_tempo (double bpm, framepos_t f, framecnt_t frame_rate) const TempoSection::beat_at_tempo (double bpm, framepos_t f, framecnt_t frame_rate) const