diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-31 03:22:10 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-31 23:12:11 +1000 |
| commit | 15045a22288697c622250cdef1fc268dcbefc239 (patch) | |
| tree | 27241d53055d5adabd618b3f977886fb1fe68dd6 | |
| parent | 395183ee7b51da12a77cf232db260435c0adb2c7 (diff) | |
BeatsFramesConverter uses quarter-note 'beat' position.
| -rw-r--r-- | libs/ardour/ardour/beats_frames_converter.h | 4 | ||||
| -rw-r--r-- | libs/ardour/beats_frames_converter.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index 4b7169bfe7..f0cd73dc6a 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -32,7 +32,7 @@ namespace ARDOUR { class TempoMap; -/** Converter between beats and frames. Takes distances in beats or frames +/** Converter between quarter-note beats and frames. Takes distances in quarter-note beats or frames * from some origin (supplied to the constructor in frames), and converts * them to the opposite unit, taking tempo changes into account. */ @@ -51,7 +51,7 @@ private: TempoMap& _tempo_map; }; -/** Converter between beats and frames. Takes distances in beats or frames +/** Converter between quarter-note beats and frames. Takes distances in quarter-note beats or frames * from some origin (supplied to the constructor in frames), and converts * them to the opposite unit, taking tempo changes into account. */ diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index 54db8008da..f35e2c757a 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -26,7 +26,7 @@ namespace ARDOUR { -/** Takes a positive duration in beats and considers it as a distance from the origin +/** Takes a positive duration in quarter-note beats and considers it as a distance from the origin * supplied to the constructor. Returns the equivalent number of frames, * taking tempo changes into account. */ @@ -38,20 +38,20 @@ BeatsFramesConverter::to (Evoral::Beats beats) const PBD::stacktrace (std::cerr, 30); return 0; } - return _tempo_map.framepos_plus_beats (_origin_b, beats) - _origin_b; + return _tempo_map.framepos_plus_qn (_origin_b, beats) - _origin_b; } /** Takes a duration in frames and considers it as a distance from the origin - * supplied to the constructor. Returns the equivalent number of beats, + * supplied to the constructor. Returns the equivalent number of quarter-note beats, * taking tempo changes into account. */ Evoral::Beats BeatsFramesConverter::from (framepos_t frames) const { - return _tempo_map.framewalk_to_beats (_origin_b, frames); + return _tempo_map.framewalk_to_qn (_origin_b, frames); } -/** As above, but with beats in double instead (for GUI). */ +/** As above, but with quarter-note beats in double instead (for GUI). */ framepos_t DoubleBeatsFramesConverter::to (double beats) const { @@ -60,14 +60,14 @@ DoubleBeatsFramesConverter::to (double beats) const PBD::stacktrace (std::cerr, 30); return 0; } - return _tempo_map.framepos_plus_beats (_origin_b, Evoral::Beats(beats)) - _origin_b; + return _tempo_map.framepos_plus_qn (_origin_b, Evoral::Beats(beats)) - _origin_b; } -/** As above, but with beats in double instead (for GUI). */ +/** As above, but with quarter-note beats in double instead (for GUI). */ double DoubleBeatsFramesConverter::from (framepos_t frames) const { - return _tempo_map.framewalk_to_beats (_origin_b, frames).to_double(); + return _tempo_map.framewalk_to_qn (_origin_b, frames).to_double(); } } /* namespace ARDOUR */ |