summaryrefslogtreecommitdiff
path: root/libs/ardour/beats_frames_converter.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-04-14 22:04:51 +0000
committerCarl Hetherington <carl@carlh.net>2012-04-14 22:04:51 +0000
commitcc7d4db5fe9132c38b919ab073b91d442abad9b6 (patch)
tree0b00a508bf8a1d5e1a7fc441770a78b5d24a9c52 /libs/ardour/beats_frames_converter.cc
parentc8228ba9853b4f0ee452343b1f1e361c584236cf (diff)
Fix a few framecnt / framepos type confusions.
git-svn-id: svn://localhost/ardour2/branches/3.0@11975 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
-rw-r--r--libs/ardour/beats_frames_converter.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc
index 62a0ebde69..94042b1b03 100644
--- 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.
*/
-framecnt_t
+framepos_t
BeatsFramesConverter::to (double beats) const
{
if (beats < 0) {
@@ -47,7 +47,7 @@ BeatsFramesConverter::to (double beats) const
* taking tempo changes into account.
*/
double
-BeatsFramesConverter::from (framecnt_t frames) const
+BeatsFramesConverter::from (framepos_t frames) const
{
double b = _tempo_map.framewalk_to_beats (_origin_b, frames);
return b;