fix construction of new xfades from legacy xfades, and add a few comments here and...

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

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index c83b63934f0836b0ef856f529b101c97d1c3ddd1..820fa0b9d84c61e63ffd6ff9d69395552112f6cf 100644 (file)
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -34,26 +34,27 @@ class CoreAudioSource : public AudioFileSource {
        CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
        ~CoreAudioSource ();
 
-        void set_path (const std::string& p);
+       void set_path (const std::string& p);
 
        float sample_rate() const;
        int update_header (framepos_t when, struct tm&, time_t);
 
        int flush_header () {return 0;};
        void set_header_timeline_position () {};
+       bool clamped_at_unity () const { return false; }
 
        static int get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg);
 
   protected:
-       nframes_t read_unlocked (Sample *dst, framepos_t start, nframes_t cnt) const;
-       nframes_t write_unlocked (Sample *dst, nframes_t cnt) { return 0; }
+       framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
+       framecnt_t write_unlocked (Sample *, framecnt_t) { return 0; }
 
   private:
        mutable CAAudioFile af;
        uint16_t n_channels;
 
        void init_cafile ();
-       int safe_read (Sample*, nframes_t start, nframes_t cnt, AudioBufferList&) const;
+       int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const;
 };
 
 }; /* namespace ARDOUR */