From 8e00b86ebb0b6e3fd489b4cac58863d7c16465db Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 16 Sep 2010 16:11:26 +0000 Subject: 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 --- libs/ardour/ardour/sndfileimportable.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'libs/ardour/ardour/sndfileimportable.h') diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h index 6e308415c9..aab8b6ac59 100644 --- a/libs/ardour/ardour/sndfileimportable.h +++ b/libs/ardour/ardour/sndfileimportable.h @@ -33,18 +33,23 @@ class SndFileImportableSource : public ImportableSource { SndFileImportableSource (const std::string& path); virtual ~SndFileImportableSource(); - nframes_t read (Sample* buffer, nframes_t nframes); - uint32_t channels() const; - nframes_t length() const; - nframes_t samplerate() const; - void seek (nframes_t pos); - nframes64_t natural_position() const; - bool clamped_at_unity () const; + nframes_t read (Sample* buffer, nframes_t nframes); + uint32_t channels() const; + framecnt_t length() const; + nframes_t samplerate() const; + void seek (nframes_t pos); + framepos_t natural_position() const; + bool clamped_at_unity () const; protected: SF_INFO sf_info; boost::shared_ptr in; - nframes_t timecode; + + /* these are int64_t so as to be independent of whatever + types Ardour may use for framepos_t, framecnt_t etc. + */ + + int64_t timecode; int64_t get_timecode_info (SNDFILE*, SF_BROADCAST_INFO*, bool&); }; -- cgit v1.2.3