$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 {
-/** 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.
*/
-framecnt_t
-BeatsFramesConverter::to (double beats) const
+framepos_t
+BeatsFramesConverter::to (Evoral::Beats beats) const
{
- assert (beats >= 0);
-
+ if (beats < Evoral::Beats()) {
+ std::cerr << "negative beats passed to BFC: " << beats << std::endl;
+ PBD::stacktrace (std::cerr, 30);
+ return 0;
+ }
return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
}
* supplied to the constructor. Returns the equivalent number of beats,
* taking tempo changes into account.
*/
-double
-BeatsFramesConverter::from (framecnt_t frames) const
+Evoral::Beats
+BeatsFramesConverter::from (framepos_t frames) const
{
return _tempo_map.framewalk_to_beats (_origin_b, frames);
}
+/** As above, but with beats in double instead (for GUI). */
+framepos_t
+DoubleBeatsFramesConverter::to (double beats) const
+{
+ if (beats < 0.0) {
+ std::cerr << "negative beats passed to BFC: " << beats << std::endl;
+ PBD::stacktrace (std::cerr, 30);
+ return 0;
+ }
+ return _tempo_map.framepos_plus_beats (_origin_b, Evoral::Beats(beats)) - _origin_b;
+}
+
+/** As above, but with beats in double instead (for GUI). */
+double
+DoubleBeatsFramesConverter::from (framepos_t frames) const
+{
+ return _tempo_map.framewalk_to_beats (_origin_b, frames).to_double();
+}
+
} /* namespace ARDOUR */