X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbeats_frames_converter.cc;h=54db8008da2c4fcabacaba0d0da64963952da040;hb=b68a4e5cdc59ffb81c1952ac9cad63ddf0c76d06;hp=b99edbf51ecd765d3c5b73f9960f79bdd60028cb;hpb=c1cfa12d6e5136d2e3e5501e83ff74c5009a9e60;p=ardour.git

diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index b99edbf51e..54db8008da 100644
--- a/libs/ardour/beats_frames_converter.cc
+++ b/libs/ardour/beats_frames_converter.cc
@@ -31,9 +31,9 @@ namespace ARDOUR {
  *  taking tempo changes into account.
  */
 framepos_t
-BeatsFramesConverter::to (Evoral::MusicalTime beats) const
+BeatsFramesConverter::to (Evoral::Beats beats) const
 {
-	if (beats < Evoral::MusicalTime()) {
+	if (beats < Evoral::Beats()) {
 		std::cerr << "negative beats passed to BFC: " << beats << std::endl;
 		PBD::stacktrace (std::cerr, 30);
 		return 0;
@@ -45,7 +45,7 @@ BeatsFramesConverter::to (Evoral::MusicalTime beats) const
  *  supplied to the constructor.  Returns the equivalent number of beats,
  *  taking tempo changes into account.
  */
-Evoral::MusicalTime
+Evoral::Beats
 BeatsFramesConverter::from (framepos_t frames) const
 {
 	return _tempo_map.framewalk_to_beats (_origin_b, frames);
@@ -60,7 +60,7 @@ DoubleBeatsFramesConverter::to (double beats) const
 		PBD::stacktrace (std::cerr, 30);
 		return 0;
 	}
-	return _tempo_map.framepos_plus_beats (_origin_b, Evoral::MusicalTime(beats)) - _origin_b;
+	return _tempo_map.framepos_plus_beats (_origin_b, Evoral::Beats(beats)) - _origin_b;
 }
 
 /** As above, but with beats in double instead (for GUI). */