diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-04 18:48:32 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-04 18:48:32 +0000 |
commit | f61a0d892cfba3ada195a8d597292d383f089037 (patch) | |
tree | f58efe22a9482ca1d6e589127187d5e5538bf258 /libs/ardour/beats_frames_converter.cc | |
parent | 2858b0474e4bedf3ab67a539a7f0d12380ac7bda (diff) |
fix error in framepos_{plus,minus}_bbt() which miscounted beats while stepping through bars - stops dragged MIDI notes from ending up in the wrong place, and more
git-svn-id: svn://localhost/ardour2/branches/3.0@11159 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
-rw-r--r-- | libs/ardour/beats_frames_converter.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index 03a581e276..215292f6c1 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -24,7 +24,7 @@ namespace ARDOUR { -/** Takes a duration in beats and considers it as a distance from the origin +/** Takes a positive duration in beats and considers it as a distance from the origin * supplied to the constructor. Returns the equivalent number of frames, * taking tempo changes into account. */ @@ -32,7 +32,6 @@ framecnt_t BeatsFramesConverter::to (double beats) const { assert (beats >= 0); - return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b; } |