Towards MIDI:

- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)

Not directly MIDI related fixes for problems in trunk:

- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem).  It still doesn't work, but at least it doesn't die

Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...


git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 2 deletions

diff --git a/libs/ardour/buffer.cc b/libs/ardour/buffer.cc
index d3791eaed1..a2090d7258 100644
--- a/libs/ardour/buffer.cc
+++ b/libs/ardour/buffer.cc
@@ -83,11 +83,14 @@ MidiBuffer::~MidiBuffer()
 		free(_data);
 }
 
+
 /** Note that offset and nframes refer to sample time, not actual buffer locations */
 void
-MidiBuffer::write(const Buffer& src, jack_nframes_t offset, jack_nframes_t nframes)
+MidiBuffer::read_from(const Buffer& src, jack_nframes_t nframes, jack_nframes_t offset)
 {
-	assert(src.type() == DataType::MIDI);
+	// FIXME: offsets?  param semantics?
+	throw;
+	assert(src.type() == _type == DataType::MIDI);
 	assert(offset == 0);
 	MidiBuffer& msrc = (MidiBuffer&)src;
 	_size = 0;