Prevent deadlock when removing routes w/o engine

[ardour.git] / libs / ardour / beats_samples_converter.cc

diff --git a/libs/ardour/beats_samples_converter.cc b/libs/ardour/beats_samples_converter.cc
index 67b13cd05f684fd07046b5e9faacb1732c55a705..ece97aed683f68b39065f1fb44bdfeaa70ae1fd5 100644 (file)
--- a/libs/ardour/beats_samples_converter.cc
+++ b/libs/ardour/beats_samples_converter.cc
@@ -31,9 +31,9 @@ namespace ARDOUR {
  *  taking tempo changes into account.
  */
 samplepos_t
-BeatsSamplesConverter::to (Evoral::Beats beats) const
+BeatsSamplesConverter::to (Temporal::Beats beats) const
 {
-       if (beats < Evoral::Beats()) {
+       if (beats < Temporal::Beats()) {
                std::cerr << "negative beats passed to BFC: " << beats << std::endl;
                PBD::stacktrace (std::cerr, 30);
                return 0;
@@ -45,7 +45,7 @@ BeatsSamplesConverter::to (Evoral::Beats beats) const
  *  supplied to the constructor.  Returns the equivalent number of quarter-note beats,
  *  taking tempo changes into account.
  */
-Evoral::Beats
+Temporal::Beats
 BeatsSamplesConverter::from (samplepos_t samples) const
 {
        return _tempo_map.framewalk_to_qn (_origin_b, samples);
@@ -60,7 +60,7 @@ DoubleBeatsSamplesConverter::to (double beats) const
                PBD::stacktrace (std::cerr, 30);
                return 0;
        }
-       return _tempo_map.samplepos_plus_qn (_origin_b, Evoral::Beats(beats)) - _origin_b;
+       return _tempo_map.samplepos_plus_qn (_origin_b, Temporal::Beats(beats)) - _origin_b;
 }
 
 /** As above, but with quarter-note beats in double instead (for GUI). */