diskstream fixups for destructive track captures. crossfade fixes for destructive sources.

git-svn-id: svn://localhost/trunk/ardour2@336 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 0 deletions

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 1d06c4ee49..007f5282d0 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -268,6 +268,18 @@ class DiskStream : public Stateful, public sigc::trackable
 
 	~DiskStream();
 
+	enum TransitionType {
+		CaptureStart = 0,
+		CaptureEnd
+	};
+	
+	struct CaptureTransition {
+
+		TransitionType   type;
+		// the start or end file frame pos
+		jack_nframes_t   capture_val;
+	};
+	
 	struct ChannelInfo {
 
 		Sample     *playback_wrap_buffer;
@@ -292,10 +304,15 @@ class DiskStream : public Stateful, public sigc::trackable
 
 		RingBufferNPT<Sample>::rw_vector playback_vector;
 		RingBufferNPT<Sample>::rw_vector capture_vector;
+
+		RingBufferNPT<CaptureTransition> * capture_transition_buf;
+		// the following are used in the butler thread only
+		jack_nframes_t                     curr_capture_cnt;
 	};
 
 	typedef vector<ChannelInfo> ChannelList;
 
+
 	string            _name;
 	ARDOUR::Session&  _session;
 	ARDOUR::IO*       _io;