diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-17 19:20:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-17 19:20:34 +0000 |
| commit | 850b7d24a9230c84183372691f11d29c8f9c3117 (patch) | |
| tree | 509da9f280eafe50257e1867bdd5b625bbcaec84 /libs | |
| parent | f7763f4d8c041bc1ce19fbca22ee6c52af8a42cb (diff) | |
Fix comment. Fix believed erroneous add of ticks to a fractional beats value.
git-svn-id: svn://localhost/ardour2/branches/3.0@8293 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/tempo.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index dd1b07ad01..c5c60b948e 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -2009,9 +2009,7 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const return pos; } -/** - * add the BBT interval @param increment to @param start and return the result - */ +/** Count the number of beats that are equivalent to distance when starting at pos */ double TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const { @@ -2067,7 +2065,7 @@ TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const */ if (ddist < frames_per_beat) { - beats += (1.0/BBT_Time::ticks_per_beat) * (ddist/frames_per_beat); + beats += ddist / frames_per_beat; break; } |