X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsndfilesource.h;h=218bbd242ac303fc4c8d87c4999bba53eb828337;hb=7a524285385d4581ad3f1e085629379e32f82fda;hp=99fb9f4d09bcf866b50c34af347f145d77f1d0a2;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 99fb9f4d09..218bbd242a 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -24,7 +24,7 @@
 
 #include "ardour/audiofilesource.h"
 #include "ardour/broadcast_info.h"
-#include "pbd/sndfile_manager.h"
+#include "ardour/progress.h"
 
 namespace ARDOUR {
 
@@ -35,7 +35,7 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 
 	/* Constructor to be called for new in-session files */
 	SndFileSource (Session&, const std::string& path, const std::string& origin,
-	               SampleFormat samp_format, HeaderFormat hdr_format, framecnt_t rate,
+	               SampleFormat samp_format, HeaderFormat hdr_format, samplecnt_t rate,
 	               Flag flags = SndFileSource::default_writable_flags);
 
 	/* Constructor to be called for recovering files being used for
@@ -46,76 +46,75 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	SndFileSource (Session&, const std::string& path, int chn);
 
 	/** Constructor to be called for existing in-session files during
-	 * session loading 
+	 * session loading
 	 */
 	SndFileSource (Session&, const XMLNode&);
 
+	/** Constructor to losslessly compress existing source */
+	SndFileSource (Session& s, const AudioFileSource& other, const std::string& path, bool use16bits = false, Progress* p = NULL);
+
 	~SndFileSource ();
 
 	float sample_rate () const;
-	int update_header (framepos_t when, struct tm&, time_t);
+	int update_header (samplepos_t when, struct tm&, time_t);
 	int flush_header ();
 	void flush ();
 
-	framepos_t natural_position () const;
+	samplepos_t natural_position () const;
 
-	framepos_t last_capture_start_frame() const;
-	void mark_capture_start (framepos_t);
+	samplepos_t last_capture_start_sample() const;
+	void mark_capture_start (samplepos_t);
 	void mark_capture_end ();
 	void clear_capture_marks();
 
-	bool set_destructive (bool yn);
-
 	bool one_of_several_channels () const;
+    uint32_t channel_count () const { return _info.channels; }
 
 	bool clamped_at_unity () const;
 
-	static void setup_standard_crossfades (Session const &, framecnt_t sample_rate);
+	static void setup_standard_crossfades (Session const &, samplecnt_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);
 
-	void release_descriptor ();
-
   protected:
+	void close ();
+
 	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;
-	framecnt_t write_unlocked (Sample *dst, framecnt_t cnt);
-	framecnt_t write_float (Sample* data, framepos_t pos, framecnt_t cnt);
+	samplecnt_t read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt) const;
+	samplecnt_t write_unlocked (Sample *dst, samplecnt_t cnt);
+	samplecnt_t write_float (Sample* data, samplepos_t pos, samplecnt_t cnt);
 
   private:
-	PBD::SndFileDescriptor* _descriptor;
+	SNDFILE* _sndfile;
 	SF_INFO _info;
 	BroadcastInfo *_broadcast_info;
 
 	void init_sndfile ();
 	int open();
-	int setup_broadcast_info (framepos_t when, struct tm&, time_t);
+	int setup_broadcast_info (samplepos_t when, struct tm&, time_t);
 	void file_closed ();
 
 	/* destructive */
 
-	static framecnt_t xfade_frames;
+	static samplecnt_t xfade_samples;
 	static gain_t* out_coefficient;
 	static gain_t* in_coefficient;
 
 	bool          _capture_start;
 	bool          _capture_end;
-	framepos_t     capture_start_frame;
-	framepos_t     file_pos; // unit is frames
-	framecnt_t     xfade_out_count;
-	framecnt_t     xfade_in_count;
+	samplepos_t     capture_start_sample;
+	samplepos_t     file_pos; // unit is samples
 	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);
-	framecnt_t nondestructive_write_unlocked (Sample *dst, framecnt_t cnt);
+	samplecnt_t crossfade (Sample* data, samplecnt_t cnt, int dir);
+	void set_timeline_position (samplepos_t);
+	samplecnt_t destructive_write_unlocked (Sample *dst, samplecnt_t cnt);
+	samplecnt_t nondestructive_write_unlocked (Sample *dst, samplecnt_t cnt);
 	void handle_header_position_change ();
 	PBD::ScopedConnection header_position_connection;
-	PBD::ScopedConnection file_manager_connection;
 };
 
 } // namespace ARDOUR