projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32_pthread is relevant for both: MSVC & MINGW
[ardour.git]
/
libs
/
ardour
/
beats_frames_converter.cc
diff --git
a/libs/ardour/beats_frames_converter.cc
b/libs/ardour/beats_frames_converter.cc
index 62a0ebde69a88cd791aba53d2285b0f04eb864c2..94042b1b03c0ae84ccece34fa4eaefc6f2464223 100644
(file)
--- a/
libs/ardour/beats_frames_converter.cc
+++ b/
libs/ardour/beats_frames_converter.cc
@@
-30,7
+30,7
@@
namespace ARDOUR {
* supplied to the constructor. Returns the equivalent number of frames,
* taking tempo changes into account.
*/
* supplied to the constructor. Returns the equivalent number of frames,
* taking tempo changes into account.
*/
-frame
cnt
_t
+frame
pos
_t
BeatsFramesConverter::to (double beats) const
{
if (beats < 0) {
BeatsFramesConverter::to (double beats) const
{
if (beats < 0) {
@@
-47,7
+47,7
@@
BeatsFramesConverter::to (double beats) const
* taking tempo changes into account.
*/
double
* taking tempo changes into account.
*/
double
-BeatsFramesConverter::from (frame
cnt
_t frames) const
+BeatsFramesConverter::from (frame
pos
_t frames) const
{
double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
return b;
{
double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
return b;