diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/ardour/audio_track.cc | |
parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
-rw-r--r-- | libs/ardour/audio_track.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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<AudioDiskstream> 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<Region> -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<boost::shared_ptr<Source> > srcs; return _session.write_one_track (*this, start, end, false, srcs, itt, enable_processing); |