X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbeats_frames_converter.h;h=4b7169bfe7edc7b5cbe36300d49696e80e0d079b;hb=e9a8ccc7e2826d8fe91eff34ee8a0683a7f7aac6;hp=381ea6c3d83cd39d76f03cf2d8dc789c4d389cec;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h
index 381ea6c3d8..4b7169bfe7 100644
--- a/libs/ardour/ardour/beats_frames_converter.h
+++ b/libs/ardour/ardour/beats_frames_converter.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2009 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2009 Paul Davis
+    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,7 +19,10 @@
     $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
 */
 
+#include "evoral/Beats.hpp"
 #include "evoral/TimeConverter.hpp"
+
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
 #ifndef __ardour_beats_frames_converter_h__
@@ -27,24 +30,44 @@
 
 namespace ARDOUR {
 
-class Session;
+class TempoMap;
+
+/** Converter between beats and frames.  Takes distances in beats or frames
+ *  from some origin (supplied to the constructor in frames), and converts
+ *  them to the opposite unit, taking tempo changes into account.
+ */
+class LIBARDOUR_API BeatsFramesConverter
+	: public Evoral::TimeConverter<Evoral::Beats,framepos_t> {
+public:
+	BeatsFramesConverter (TempoMap& tempo_map, framepos_t origin)
+		: Evoral::TimeConverter<Evoral::Beats, framepos_t> (origin)
+		, _tempo_map(tempo_map)
+	{}
+
+	framepos_t    to (Evoral::Beats beats) const;
+	Evoral::Beats from (framepos_t frames) const;
+
+private:
+	TempoMap& _tempo_map;
+};
 
-class BeatsFramesConverter : public Evoral::TimeConverter<double,sframes_t> {
+/** Converter between beats and frames.  Takes distances in beats or frames
+ *  from some origin (supplied to the constructor in frames), and converts
+ *  them to the opposite unit, taking tempo changes into account.
+ */
+class LIBARDOUR_API DoubleBeatsFramesConverter
+	: public Evoral::TimeConverter<double,framepos_t> {
 public:
-	BeatsFramesConverter(Session& session, sframes_t origin)
-		: _session(session)
-		, _origin(origin)
+	DoubleBeatsFramesConverter (TempoMap& tempo_map, framepos_t origin)
+		: Evoral::TimeConverter<double, framepos_t> (origin)
+		, _tempo_map(tempo_map)
 	{}
-	
-	sframes_t to(double beats)       const;
-	double    from(sframes_t frames) const;
 
-	sframes_t origin() const              { return _origin; }
-	void     set_origin(sframes_t origin) { _origin = origin; }
+	framepos_t          to (double beats) const;
+	double from (framepos_t frames) const;
 
 private:
-	Session&  _session;
-	sframes_t _origin;
+	TempoMap& _tempo_map;
 };
 
 } /* namespace ARDOUR */