summaryrefslogtreecommitdiff
path: root/libs/ardour/beats_frames_converter.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-12-14 20:28:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-12-14 20:28:37 +0000
commitf09524b9d30115e51294edc3af4399194f8478f1 (patch)
tree7c3bb83e413f790fac39b0d7c9a7e31ae279d5d2 /libs/ardour/beats_frames_converter.cc
parentee5a37a306babadc81ac4a2612b260dc612a381a (diff)
move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
-rw-r--r--libs/ardour/beats_frames_converter.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index 4cda4173b3..c2c54eb9cd 100644
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -27,13 +27,7 @@ namespace ARDOUR {
framecnt_t
BeatsFramesConverter::to(double beats) const
{
- Timecode::BBT_Time delta;
-
- delta.bars = 0;
- delta.beats = rint (floor (beats));
- delta.ticks = rint (floor (Meter::ticks_per_beat * fmod (beats, 1.0)));
-
- return _tempo_map.framepos_plus_bbt (_origin_b, delta);
+ return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats));
}
double