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 7983b2e340f1d5b44bc7ecec9e8fda223941ad07..bed431c4902d5f5845b0b5c24b5f4f7b240587b4 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -24,18 +24,19 @@
 
 #include "ardour/audiofilesource.h"
 #include "ardour/broadcast_info.h"
+#include "pbd/sndfile_manager.h"
 
 namespace ARDOUR {
 
 class SndFileSource : public AudioFileSource {
   public:
        /** Constructor to be called for existing external-to-session files */
-       SndFileSource (Session&, const Glib::ustring& path, bool embedded, int chn, Flag flags);
+       SndFileSource (Session&, const std::string& path, int chn, Flag flags);
 
        /* Constructor to be called for new in-session files */
-       SndFileSource (Session&, const Glib::ustring& path, bool embedded,
-                       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&);
@@ -43,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();
 
@@ -57,47 +59,52 @@ class SndFileSource : public AudioFileSource {
 
        bool one_of_several_channels () const;
 
-       static void setup_standard_crossfades (Session const &, nframes_t sample_rate);
+       bool clamped_at_unity () const;
+
+       static void setup_standard_crossfades (Session const &, framecnt_t sample_rate);
        static const Source::Flag default_writable_flags;
 
-       static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, std::string& error_msg);
+       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_header_timeline_position ();
 
-       nframes_t read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const;
-       nframes_t write_unlocked (Sample *dst, nframes_t cnt);
-
-       nframes_t write_float (Sample* data, sframes_t pos, nframes_t cnt);
+       framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
+       framecnt_t write_unlocked (Sample *dst, framecnt_t cnt);
+       framecnt_t write_float (Sample* data, framepos_t pos, framecnt_t cnt);
 
   private:
-       SNDFILE *sf;
+       PBD::SndFileDescriptor* _descriptor;
        SF_INFO _info;
        BroadcastInfo *_broadcast_info;
 
        void init_sndfile ();
        int open();
-       int setup_broadcast_info (sframes_t when, struct tm&, time_t);
+       int setup_broadcast_info (framepos_t when, struct tm&, time_t);
+       void file_closed ();
 
        /* destructive */
 
-       static nframes_t xfade_frames;
+       static framecnt_t xfade_frames;
        static gain_t* out_coefficient;
        static gain_t* in_coefficient;
 
        bool          _capture_start;
        bool          _capture_end;
-       sframes_t      capture_start_frame;
-       sframes_t      file_pos; // unit is frames
-       nframes_t      xfade_out_count;
-       nframes_t      xfade_in_count;
+       framepos_t     capture_start_frame;
+       framepos_t     file_pos; // unit is frames
+       framecnt_t     xfade_out_count;
+       framecnt_t     xfade_in_count;
        Sample*        xfade_buf;
 
-       nframes_t crossfade (Sample* data, nframes_t cnt, int dir);
-       void set_timeline_position (int64_t);
-       nframes_t destructive_write_unlocked (Sample *dst, nframes_t cnt);
-       nframes_t nondestructive_write_unlocked (Sample *dst, nframes_t cnt);
+       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);
+       framecnt_t nondestructive_write_unlocked (Sample *dst, framecnt_t cnt);
        void handle_header_position_change ();
+       PBD::ScopedConnection header_position_connection;
+       PBD::ScopedConnection file_manager_connection;
 };
 
 } // namespace ARDOUR