/*
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
$Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
*/
+#include "pbd/stacktrace.h"
+
#include "ardour/beats_frames_converter.h"
#include "ardour/tempo.h"
namespace ARDOUR {
-sframes_t
-BeatsFramesConverter::to(double beats) const
+/** 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.
+ */
+framepos_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);
+ if (beats < 0) {
+ std::cerr << "negative beats passed to BFC: " << beats << std::endl;
+ PBD::stacktrace (std::cerr, 30);
+ }
+ assert (beats >= 0);
+ 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
+ * supplied to the constructor. Returns the equivalent number of beats,
+ * taking tempo changes into account.
+ */
double
-BeatsFramesConverter::from(sframes_t frames) const
+BeatsFramesConverter::from (framepos_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;
+ double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
+ return b;
}
} /* namespace ARDOUR */