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/resampled_source.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/resampled_source.cc')
| -rw-r--r-- | libs/ardour/resampled_source.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc index 7379aa74af..1d60281565 100644 --- a/libs/ardour/resampled_source.cc +++ b/libs/ardour/resampled_source.cc @@ -28,7 +28,7 @@ using namespace PBD; const uint32_t ResampledImportableSource::blocksize = 16384U; -ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, nframes_t rate, SrcQuality srcq) +ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, framecnt_t rate, SrcQuality srcq) : source (src) , src_state (0) { @@ -65,8 +65,8 @@ ResampledImportableSource::~ResampledImportableSource () delete [] input; } -nframes_t -ResampledImportableSource::read (Sample* output, nframes_t nframes) +framecnt_t +ResampledImportableSource::read (Sample* output, framecnt_t nframes) { int err; @@ -78,7 +78,7 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes) /* The last read will not be a full buffer, so set end_of_input. */ - if ((nframes_t) src_data.input_frames < blocksize) { + if ((framecnt_t) src_data.input_frames < blocksize) { src_data.end_of_input = true; } @@ -91,7 +91,7 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes) if (!src_data.end_of_input) { src_data.output_frames = nframes / source->channels(); } else { - src_data.output_frames = std::min ((nframes_t) src_data.input_frames, nframes / source->channels()); + src_data.output_frames = std::min ((framecnt_t) src_data.input_frames, nframes / source->channels()); } if ((err = src_process (src_state, &src_data))) { @@ -112,7 +112,7 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes) } void -ResampledImportableSource::seek (nframes_t pos) +ResampledImportableSource::seek (framepos_t pos) { source->seek (pos); |