Progress on the disk side of things:

- MidiRingBuffer implementation
- MidiDiskstream reading from playlists
- MidiPlaylist reading from regions
- MidiRegions returning random notes for the time being, but the inter-thread stuff works..

Horrible awful mess, not really commit worthy, but I need to move machines.
Nothing to see here.. :)



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

1 files changed, 10 insertions, 6 deletions

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 3c48f0ce9e..f6eafe11bd 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -39,19 +39,23 @@ class MidiPort : public Port {
 	
 	DataType type() const { return DataType(DataType::MIDI); }
 
-	MidiBuffer& get_buffer() {
-		return *_buffer;
+	Buffer& get_buffer() {
+		return _buffer;
+	}
+
+	MidiBuffer& get_midi_buffer() {
+		return _buffer;
 	}
 	
 	void cycle_start(jack_nframes_t nframes);
 	void cycle_end();
 
-	size_t capacity() { return _buffer->capacity(); }
-	size_t size()     { return _buffer->size(); }
+	size_t capacity() { return _buffer.capacity(); }
+	size_t size()     { return _buffer.size(); }
 	
 	/** Assumes that the port is an output port */
 	void silence (jack_nframes_t nframes, jack_nframes_t offset) {
-		_buffer->silence(nframes, offset);
+		_buffer.silence(nframes, offset);
 	}
 
   protected:
@@ -61,7 +65,7 @@ class MidiPort : public Port {
 	
 	/* engine isn't supposed to access below here */
 
-	MidiBuffer*    _buffer;
+	MidiBuffer     _buffer;
 	jack_nframes_t _nframes_this_cycle;
 };