diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
| commit | ede4ecbb00ecc866c502454c81e711baea780ccd (patch) | |
| tree | d4a05e59cc96651ddf0eeab929f58fb7a7019fb0 /libs/ardour/beats_frames_converter.cc | |
| parent | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (diff) | |
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/beats_frames_converter.cc')
| -rw-r--r-- | libs/ardour/beats_frames_converter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index 9d3b8ae4c6..180b3e563a 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -24,7 +24,7 @@ namespace ARDOUR { -sframes_t +framecnt_t BeatsFramesConverter::to(double beats) const { // FIXME: assumes tempo never changes after origin @@ -33,11 +33,11 @@ BeatsFramesConverter::to(double beats) const _tempo_map.frame_rate(), _tempo_map.meter_at (_origin_b)); - return lrint(beats * frames_per_beat); + return llrint (beats * frames_per_beat); } double -BeatsFramesConverter::from(sframes_t frames) const +BeatsFramesConverter::from (framecnt_t frames) const { // FIXME: assumes tempo never changes after origin const Tempo& tempo = _tempo_map.tempo_at (_origin_b); |