summaryrefslogtreecommitdiff
path: root/libs/ardour/beats_frames_converter.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-12-10 13:49:08 +0000
committerCarl Hetherington <carl@carlh.net>2011-12-10 13:49:08 +0000
commite02e25e3f31bafbdbb12cb76dcde4b34917a939d (patch)
tree2632b898a0284cf61c3ce061d6d82cf82c0be2e5 /libs/ardour/beats_frames_converter.cc
parent2a9ceb74c4f8ec316c639722c371e5bcb78de548 (diff)
Add fixed-up framepos_plus_beats() and use it for the BeatsFramesConverter, since it only ever passed in beats to framepos_plus_bbt anyway.
git-svn-id: svn://localhost/ardour2/branches/3.0@10964 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
-rw-r--r--libs/ardour/beats_frames_converter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index 59c0bb2896..f5d1794abb 100644
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -29,7 +29,7 @@ BeatsFramesConverter::to (double beats) const
{
assert (beats >= 0);
- return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats)) - _origin_b;
+ return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
}
double