ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

BeatsFramesConverter uses quarter-note 'beat' position.

Browse Source
This commit is contained in:
nick_m 2016-08-31 03:22:10 +10:00
parent 395183ee7b
commit 15045a2228
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/beats_frames_converter.h
View File

@ -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.
*/

16
libs/ardour/beats_frames_converter.cc
View File

@ -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 */