fix all manner of wrongness with port buffer offsets

git-svn-id: svn://localhost/ardour2/branches/3.0@9098 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 1 deletions

diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 403a70232f..63eb7d7c20 100644
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -49,6 +49,9 @@ public:
 		assert(src.type() == DataType::AUDIO);
 		assert(len <= _capacity);
 		memcpy(_data + dst_offset, ((AudioBuffer&)src).data() + src_offset, sizeof(Sample) * len);
+                if (next_write_addr >= _data + _capacity) {
+                        next_write_addr = _data;
+                }
 		if (dst_offset == 0 && src_offset == 0 && len == _capacity) {
 			_silent = src.silent();
 		} else {
@@ -169,11 +172,12 @@ public:
 	void prepare () { _written = false; }
 	bool written() const { return _written; }
 
+        void set_marked_for_write (bool yn) { mfw = yn; }
+
   private:
 	bool    _owns_data;
 	bool    _written;
 	Sample* _data; ///< Actual buffer contents
-
 };