diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
| commit | 7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79 (patch) | |
| tree | 388aecd96220df899626709aeb8c7dbc37fd9088 /libs/ardour/beats_samples_converter.cc | |
| parent | 9283bee867ce788465f3e48ed889cd324e098e64 (diff) | |
convert codebase to use Temporal for various time types
Diffstat (limited to 'libs/ardour/beats_samples_converter.cc')
| -rw-r--r-- | libs/ardour/beats_samples_converter.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/beats_samples_converter.cc b/libs/ardour/beats_samples_converter.cc index 67b13cd05f..ece97aed68 100644 --- 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). */ |