diff options
| author | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
| commit | 2a251b457069ffb4b744fbd0dd7aca7acb31f381 (patch) | |
| tree | 4311e63fe7ef1b5d7a5b841a4dd0eb7b26b324a7 /libs/ardour/beats_frames_converter.cc | |
| parent | 4d202d9157bef5b6325fe54b7874080952f86a37 (diff) | |
MusicalTime => Beats.
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
| -rw-r--r-- | libs/ardour/beats_frames_converter.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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). */ |