X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsndfileimportable.h;h=f085334a2136069da442d2702c47e7a88ac8b2da;hb=7629120cda89dd4ec1b03ba4ddcc6f5dd1b0ca5a;hp=42ce83c0ee440ba1e23c8804953f442229a5a945;hpb=3b54a75aa9c03edb32d3960c5aacba640e1901e0;p=ardour.git diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h index 42ce83c0ee..f085334a21 100644 --- a/libs/ardour/ardour/sndfileimportable.h +++ b/libs/ardour/ardour/sndfileimportable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,17 +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; + framecnt_t read (Sample* buffer, framecnt_t nframes); + uint32_t channels() const; + framecnt_t length() const; + framecnt_t samplerate() const; + void seek (framecnt_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&); };