/*
Copyright (C) 2009 Paul Davis
- Author: Dave Robillard
+ Author: David Robillard
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
namespace ARDOUR {
-sframes_t
-BeatsFramesConverter::to(double beats) const
+framecnt_t
+BeatsFramesConverter::to (double beats) const
{
- // FIXME: assumes tempo never changes after origin
- const Tempo& tempo = _tempo_map.tempo_at (_origin_b);
- const double frames_per_beat = tempo.frames_per_beat(
- _tempo_map.frame_rate(),
- _tempo_map.meter_at (_origin_b));
-
- return lrint(beats * frames_per_beat);
+ assert (beats >= 0);
+
+ return _tempo_map.framepos_plus_bbt (_origin_b, Timecode::BBT_Time(beats)) - _origin_b;
}
double
-BeatsFramesConverter::from(sframes_t frames) const
+BeatsFramesConverter::from (framecnt_t frames) const
{
- // FIXME: assumes tempo never changes after origin
- const Tempo& tempo = _tempo_map.tempo_at (_origin_b);
- const double frames_per_beat = tempo.frames_per_beat(
- _tempo_map.frame_rate(),
- _tempo_map.meter_at (_origin_b));
-
- return frames / frames_per_beat;
+ return _tempo_map.framewalk_to_beats (_origin_b, frames);
}
} /* namespace ARDOUR */