remove offset from process callback tree. some breakage may have occured. yes, really.

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

1 files changed, 3 insertions, 4 deletions

diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 9c2ee466d3..70e2203df4 100644
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -37,9 +37,8 @@ public:
 	MidiBuffer(size_t capacity);
 	~MidiBuffer();
 
-	void silence(nframes_t dur, nframes_t offset=0);
-	
-	void read_from(const Buffer& src, nframes_t nframes, nframes_t offset);
+	void silence (nframes_t nframes, nframes_t offset = 0);
+	void read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0);
 	
 	void copy(const MidiBuffer& copy);
 
@@ -54,7 +53,7 @@ public:
 	
 	template<typename BufferType, typename EventType>
 	struct iterator_base {
-		iterator_base<BufferType, EventType>(BufferType& b, size_t o) : buffer(b), offset(o) {}
+	    iterator_base<BufferType, EventType>(BufferType& b, nframes_t o) : buffer(b), offset(o) {}
 		inline EventType operator*() const {
 			uint8_t* ev_start = buffer._data + offset + sizeof(TimeType);
 			int event_size = Evoral::midi_event_size(ev_start);