diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-06 16:39:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-06 16:39:40 +0000 |
| commit | 355183f1abea75d8fab0926cd7e7130796574cb0 (patch) | |
| tree | 78cc092b820fda137e752529f2d45c794c375313 /libs/ardour/beats_frames_converter.cc | |
| parent | bdb15f942250ad3e8a42c6bef927374eedb0299f (diff) | |
partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
| -rw-r--r-- | libs/ardour/beats_frames_converter.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index 215292f6c1..584732ff03 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -32,7 +32,8 @@ framecnt_t BeatsFramesConverter::to (double beats) const { assert (beats >= 0); - return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b; + framecnt_t r = _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b; + return r; } /** Takes a duration in frames and considers it as a distance from the origin @@ -42,7 +43,8 @@ BeatsFramesConverter::to (double beats) const double BeatsFramesConverter::from (framecnt_t frames) const { - return _tempo_map.framewalk_to_beats (_origin_b, frames); + double b = _tempo_map.framewalk_to_beats (_origin_b, frames); + return b; } } /* namespace ARDOUR */ |