X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fdiskstream.h;h=cde21b209f66702d4a61a1eda868b33aa472cbea;hb=b7a711e385a6a8cbd4d170bae449b4785f890b23;hp=81eb588d1acb87ece0b2f49e2144936ba67942d3;hpb=8ca9061b308238ba80d82b6960e79fa1ea5cda92;p=ardour.git

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 81eb588d1a..cde21b209f 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -34,6 +34,7 @@
 #include "ardour/ardour.h"
 #include "ardour/chan_count.h"
 #include "ardour/session_object.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/utils.h"
 #include "ardour/public_diskstream.h"
@@ -49,11 +50,12 @@ class Source;
 class Session;
 class Track;
 class Location;
+class BufferSet;
 
 /** Parent class for classes which can stream data to and from disk.
  *  These are used by Tracks to get playback and put recorded data.
  */
-class Diskstream : public SessionObject, public PublicDiskstream
+class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream
 {
   public:
 	enum Flag {
@@ -68,6 +70,17 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual ~Diskstream();
 
 	virtual bool set_name (const std::string& str);
+	virtual bool set_write_source_name (const std::string& str);
+
+	std::string write_source_name () const {
+		if (_write_source_name.empty()) {
+			return name();
+		} else {
+			return _write_source_name;
+		}
+	}
+
+	virtual std::string steal_write_source_name () { return std::string(); }
 
 	boost::shared_ptr<ARDOUR::IO> io() const { return _io; }
 	void set_track (ARDOUR::Track *);
@@ -125,15 +138,19 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	ChanCount n_channels() { return _n_channels; }
 
-	static framecnt_t disk_io_frames() { return disk_io_chunk_frames; }
-	static void set_disk_io_chunk_frames (framecnt_t n) { disk_io_chunk_frames = n; }
+	static framecnt_t disk_read_frames() { return disk_read_chunk_frames; }
+	static framecnt_t disk_write_frames() { return disk_write_chunk_frames; }
+	static void set_disk_read_chunk_frames (framecnt_t n) { disk_read_chunk_frames = n; }
+	static void set_disk_write_chunk_frames (framecnt_t n) { disk_write_chunk_frames = n; }
+	static framecnt_t default_disk_read_chunk_frames ();
+	static framecnt_t default_disk_write_chunk_frames ();
 
 	/* Stateful */
 	virtual XMLNode& get_state(void);
 	virtual int      set_state(const XMLNode&, int version);
 
-	virtual void request_jack_monitors_input (bool) {}
-	virtual void ensure_jack_monitors_input (bool) {}
+	virtual void request_input_monitoring (bool) {}
+	virtual void ensure_input_monitoring (bool) {}
 
 	framecnt_t   capture_offset() const { return _capture_offset; }
 	virtual void set_capture_offset ();
@@ -191,7 +208,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
   protected:
 	friend class Track;
 
-	virtual int  process (framepos_t transport_frame, pframes_t nframes, framecnt_t &) = 0;
+    virtual int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal) = 0;
+    virtual frameoffset_t calculate_playback_distance (pframes_t nframes) = 0;
 	virtual bool commit  (framecnt_t) = 0;
 
 	//private:
@@ -241,7 +259,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual void set_align_style_from_io() {}
 	virtual void setup_destructive_playlist () {}
 	virtual void use_destructive_playlist () {}
-	virtual void prepare_to_stop (framepos_t pos);
+	virtual void prepare_to_stop (framepos_t transport_pos, framepos_t audible_frame);
 
 	void engage_record_enable ();
 	void disengage_record_enable ();
@@ -254,7 +272,9 @@ class Diskstream : public SessionObject, public PublicDiskstream
 		framecnt_t& rec_nframes, framecnt_t& rec_offset
 		);
 
-	static framecnt_t disk_io_chunk_frames;
+	static framecnt_t disk_read_chunk_frames;
+	static framecnt_t disk_write_chunk_frames;
+
 	std::vector<CaptureInfo*> capture_info;
 	mutable Glib::Threads::Mutex capture_info_lock;
 
@@ -307,6 +327,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	bool          in_set_state;
 
+	std::string   _write_source_name;
+
 	Glib::Threads::Mutex state_lock;
 
 	PBD::ScopedConnectionList playlist_connections;