X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbeats_frames_converter.cc;h=54db8008da2c4fcabacaba0d0da64963952da040;hb=8367b7cab344e75908744a95fda860c7fadff420;hp=62a0ebde69a88cd791aba53d2285b0f04eb864c2;hpb=09f5369feadbb09dee7f14373e571e01f10d21fa;p=ardour.git

diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index 62a0ebde69..54db8008da 100644
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -30,27 +30,44 @@ namespace ARDOUR {
  *  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
 {
-	if (beats < 0) {
+	if (beats < Evoral::Beats()) {
 		std::cerr << "negative beats passed to BFC: " << beats << std::endl;
 		PBD::stacktrace (std::cerr, 30);
+		return 0;
 	}
-	assert (beats >= 0);
-	framecnt_t r = _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
-	return r;
+	return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b;
 }
 
 /** 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.
  */
+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
-BeatsFramesConverter::from (framecnt_t frames) const
+DoubleBeatsFramesConverter::from (framepos_t frames) const
 {
-	double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
-	return b;
+	return _tempo_map.framewalk_to_beats (_origin_b, frames).to_double();
 }
 
 } /* namespace ARDOUR */