Fix up confusion with relayering after movement drags in

[ardour.git] / libs / ardour / ardour / sndfileimportable.h

diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index 6e308415c97072956d6a1c80994aebfcdb1dfdc2..f085334a2136069da442d2702c47e7a88ac8b2da 100644 (file)
--- 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;
+       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<SNDFILE> 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&);
 };