- Changed IO's vector<Port*>'s to PortList

- Added new Port classes, code to drive them
- Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage)
- Added ChanCount, though it isn't very thoroughly used yet.  That's the next step....
- Fixed a few bugs relating to loading sessions saved with trunk
- Fixed a few random other bugs

Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here

Warning:  Removing ports is currently (intentionally) broken due solely to laziness.


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

1 files changed, 102 insertions, 0 deletions

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
new file mode 100644
index 0000000000..e785710b01
--- /dev/null
+++ b/libs/ardour/midi_port.cc
@@ -0,0 +1,102 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <cassert>
+#include <ardour/midi_port.h>
+#include <ardour/data_type.h>
+#include <iostream>
+
+using namespace ARDOUR;
+using namespace std;
+
+MidiPort::MidiPort(jack_port_t* p)
+	: Port(p)
+	, _buffer(NULL)
+	, _nframes_this_cycle(0)
+{
+	DataType dt(_type);
+	assert(dt == DataType::MIDI);
+
+	reset();
+
+	_buffer = new MidiBuffer(4096); // FIXME FIXME FIXME
+}
+
+
+MidiPort::~MidiPort()
+{
+	delete _buffer;
+}
+
+void
+MidiPort::cycle_start (jack_nframes_t nframes)
+{
+	_nframes_this_cycle = nframes;
+
+	if (_flags & JackPortIsOutput) {
+		_buffer->set_size(0);
+		return;
+	}
+
+	// We're an input - copy Jack events to internal buffer
+	
+	void* jack_buffer = jack_port_get_buffer(_port, nframes);
+
+	const jack_nframes_t event_count
+		= jack_midi_port_get_info(jack_buffer, nframes)->event_count;
+
+	assert(event_count < _buffer->capacity());
+
+	for (jack_nframes_t i=0; i < event_count; ++i) {
+		jack_midi_event_t* const ev = &_buffer->data()[i];
+		jack_midi_event_get(ev, jack_buffer, i, nframes);
+
+		// Convert note ons with velocity 0 to proper note offs
+		// FIXME: Jack MIDI should guarantee this - does it?
+		//if (ev->buffer[0] == MIDI_CMD_NOTE_ON && ev->buffer[2] == 0)
+		//	ev->buffer[0] = MIDI_CMD_NOTE_OFF;
+	}
+
+	_buffer->set_size(event_count);
+	
+	if (_buffer->size() > 0)
+		cerr << "MIDIPort got " << event_count << " events." << endl;
+}
+
+void
+MidiPort::cycle_end()
+{
+	if (_flags & JackPortIsInput) {
+		_nframes_this_cycle = 0; // catch any oopses
+		return;
+	}
+
+	// We're an output - copy events from internal buffer to Jack buffer
+	
+	void* jack_buffer = jack_port_get_buffer(_port, _nframes_this_cycle);
+
+	const jack_nframes_t event_count = _buffer->size();
+
+	jack_midi_clear_buffer(jack_buffer, _nframes_this_cycle);
+	for (jack_nframes_t i=0; i < event_count; ++i) {
+		const jack_midi_event_t& ev = _buffer->data()[i];
+		jack_midi_event_write(jack_buffer, ev.time, ev.buffer, ev.size, _nframes_this_cycle);
+	}
+	
+	_nframes_this_cycle = 0; // catch oopses
+}