Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 59dd603236c60ee3daa7301fdaba6946904a5992..bed431c4902d5f5845b0b5c24b5f4f7b240587b4 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -34,9 +34,9 @@ class SndFileSource : public AudioFileSource {
        SndFileSource (Session&, const std::string& path, int chn, Flag flags);
 
        /* Constructor to be called for new in-session files */
-       SndFileSource (Session&, const std::string& path, 
-                       SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
-                       Flag flags = SndFileSource::default_writable_flags);
+       SndFileSource (Session&, const std::string& path, const std::string& origin,
+                      SampleFormat samp_format, HeaderFormat hdr_format, framecnt_t rate,
+                      Flag flags = SndFileSource::default_writable_flags);
 
        /** Constructor to be called for existing in-session files */
        SndFileSource (Session&, const XMLNode&);
@@ -44,13 +44,14 @@ class SndFileSource : public AudioFileSource {
        ~SndFileSource ();
 
        float sample_rate () const;
-       int update_header (sframes_t when, struct tm&, time_t);
+       int update_header (framepos_t when, struct tm&, time_t);
        int flush_header ();
+       void flush ();
 
-       nframes64_t natural_position () const;
+       framepos_t natural_position () const;
 
-       sframes_t last_capture_start_frame() const;
-       void mark_capture_start (sframes_t);
+       framepos_t last_capture_start_frame() const;
+       void mark_capture_start (framepos_t);
        void mark_capture_end ();
        void clear_capture_marks();
 
@@ -60,13 +61,13 @@ class SndFileSource : public AudioFileSource {
 
        bool clamped_at_unity () const;
 
-       static void setup_standard_crossfades (Session const &, nframes_t sample_rate);
+       static void setup_standard_crossfades (Session const &, framecnt_t sample_rate);
        static const Source::Flag default_writable_flags;
 
        static int get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error_msg);
 
   protected:
-        void set_path (const std::string& p);
+       void set_path (const std::string& p);
        void set_header_timeline_position ();
 
        framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
@@ -96,7 +97,7 @@ class SndFileSource : public AudioFileSource {
        framecnt_t     xfade_out_count;
        framecnt_t     xfade_in_count;
        Sample*        xfade_buf;
-       
+
        framecnt_t crossfade (Sample* data, framecnt_t cnt, int dir);
        void set_timeline_position (framepos_t);
        framecnt_t destructive_write_unlocked (Sample *dst, framecnt_t cnt);