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/sndfileimportable.cc | |
| 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/sndfileimportable.cc')
| -rw-r--r-- | libs/ardour/sndfileimportable.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 99697b888f..b51ad3634a 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -57,10 +57,10 @@ SndFileImportableSource::channels () const return sf_info.channels; } -nframes_t +framecnt_t SndFileImportableSource::length () const { - return sf_info.frames; + return (framecnt_t) sf_info.frames; } nframes_t @@ -75,10 +75,10 @@ SndFileImportableSource::seek (nframes_t /*pos*/) sf_seek (in.get(), 0, SEEK_SET); } -nframes64_t +framepos_t SndFileImportableSource::natural_position () const { - return timecode; + return (framepos_t) timecode; } bool |