From 73192bc1a7ea55fa1864dc3826845b15c00dd2ec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 3 Dec 2010 22:26:29 +0000 Subject: Remove all use of nframes_t. git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_track.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/ardour/audio_track.cc') diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index ca2291902d..182fdccd26 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -354,7 +354,7 @@ AudioTrack::set_state_part_two () } int -AudioTrack::roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, +AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool can_record, bool rec_monitors_input, bool& need_butler) { Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK); @@ -365,7 +365,7 @@ AudioTrack::roll (nframes_t nframes, framepos_t start_frame, framepos_t end_fram int dret; Sample* b; Sample* tmpb; - nframes_t transport_frame; + framepos_t transport_frame; boost::shared_ptr diskstream = audio_diskstream(); automation_snapshot (start_frame, false); @@ -453,7 +453,7 @@ AudioTrack::roll (nframes_t nframes, framepos_t start_frame, framepos_t end_fram Sample* bb = bufs.get_audio (i).data(); - for (nframes_t xx = 0; xx < nframes; ++xx) { + for (pframes_t xx = 0; xx < nframes; ++xx) { bb[xx] = b[xx] * scaling; } @@ -595,7 +595,7 @@ AudioTrack::bounce (InterThreadInfo& itt) } boost::shared_ptr -AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt, bool enable_processing) +AudioTrack::bounce_range (framepos_t start, framepos_t end, InterThreadInfo& itt, bool enable_processing) { vector > srcs; return _session.write_one_track (*this, start, end, false, srcs, itt, enable_processing); -- cgit v1.2.3