X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbeats_frames_converter.cc;h=f35e2c757ae2a82aed10fdf3a95da41d4c92d5c2;hb=b23d7d9170a12cbcd788e1c2cbcf688f376752ed;hp=f93e5e7224642b07d2681fdd78a6798cf6ac56c3;hpb=01b761bbaa1dd7af210b20f47530efe31e9edc76;p=ardour.git

diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index f93e5e7224..f35e2c757a 100644
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -1,6 +1,6 @@
 /*
     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
@@ -19,33 +19,55 @@
     $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 quarter-note 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 (Evoral::Beats beats) const
 {
-	// FIXME: assumes tempo never changes after origin
-	const Tempo& tempo = _tempo_map.tempo_at(_origin);
-	const double frames_per_beat = tempo.frames_per_beat(
-			_tempo_map.frame_rate(),
-			_tempo_map.meter_at(_origin));
+	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_qn (_origin_b, beats) - _origin_b;
+}
 
-	return lrint(beats * frames_per_beat);
+/** Takes a duration in frames and considers it as a distance from the origin
+ *  supplied to the constructor.  Returns the equivalent number of quarter-note beats,
+ *  taking tempo changes into account.
+ */
+Evoral::Beats
+BeatsFramesConverter::from (framepos_t frames) const
+{
+	return _tempo_map.framewalk_to_qn (_origin_b, frames);
 }
 
-double
-BeatsFramesConverter::from(sframes_t frames) const
+/** As above, but with quarter-note beats in double instead (for GUI). */
+framepos_t
+DoubleBeatsFramesConverter::to (double beats) const
 {
-	// FIXME: assumes tempo never changes after origin
-	const Tempo& tempo = _tempo_map.tempo_at(_origin);
-	const double frames_per_beat = tempo.frames_per_beat(
-			_tempo_map.frame_rate(),
-			_tempo_map.meter_at(_origin));
+	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_qn (_origin_b, Evoral::Beats(beats)) - _origin_b;
+}
 
-	return frames / frames_per_beat;
+/** As above, but with quarter-note beats in double instead (for GUI). */
+double
+DoubleBeatsFramesConverter::from (framepos_t frames) const
+{
+	return _tempo_map.framewalk_to_qn (_origin_b, frames).to_double();
 }
 
 } /* namespace ARDOUR */