diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-16 16:11:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-16 16:11:26 +0000 |
| commit | 8e00b86ebb0b6e3fd489b4cac58863d7c16465db (patch) | |
| tree | 27e602cbd16a9c948728b578df112b78f0d62c12 /libs/ardour/ardour/resampled_source.h | |
| parent | 084dda86a7c4391aba4e9f37f752af4846ded15d (diff) | |
make resampled sources (during import) report their "natural position" (i.e. BWF timecode) using the samplerate of the session, not the original source, for correct positioning; minor frame{pos,cnt}_t cleanup
git-svn-id: svn://localhost/ardour2/branches/3.0@7785 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/resampled_source.h')
| -rw-r--r-- | libs/ardour/ardour/resampled_source.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h index b61303b65c..6d630bc44b 100644 --- a/libs/ardour/ardour/resampled_source.h +++ b/libs/ardour/ardour/resampled_source.h @@ -34,13 +34,13 @@ class ResampledImportableSource : public ImportableSource ~ResampledImportableSource (); - nframes_t read (Sample* buffer, nframes_t nframes); - float ratio() const { return src_data.src_ratio; } - uint32_t channels() const { return source->channels(); } - nframes_t length() const { return source->length(); } - nframes_t samplerate() const { return source->samplerate(); } - void seek (nframes_t); - nframes64_t natural_position() const { return source->natural_position(); } + nframes_t read (Sample* buffer, nframes_t nframes); + float ratio() const { return src_data.src_ratio; } + uint32_t channels() const { return source->channels(); } + framecnt_t length() const { return source->length(); } + nframes_t samplerate() const { return source->samplerate(); } + void seek (nframes_t); + framepos_t natural_position() const; bool clamped_at_unity () const { /* resampling may generate inter-sample peaks with magnitude > 1 */ |