Preliminary MIDI plugin support.

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

1 files changed, 14 insertions, 25 deletions

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index f287414fe5..348542ce1c 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -507,34 +507,23 @@ LadspaPlugin::automatable () const
 }
 
 int
-LadspaPlugin::connect_and_run (BufferSet& bufs, uint32_t& in_index, uint32_t& out_index, nframes_t nframes, nframes_t offset)
+LadspaPlugin::connect_and_run (BufferSet& bufs,
+		ChanMapping in_map, ChanMapping out_map,
+		nframes_t nframes, nframes_t offset)
 {
-	uint32_t port_index = 0;
-	cycles_t then, now;
-
-	then = get_cycles ();
-
-	const uint32_t nbufs = bufs.count().n_audio();
-
-	while (port_index < parameter_count()) {
-		if (LADSPA_IS_PORT_AUDIO (port_descriptor(port_index))) {
-			if (LADSPA_IS_PORT_INPUT (port_descriptor(port_index))) {
-				const size_t index = min(in_index, nbufs - 1);
-				connect_port (port_index, bufs.get_audio(index).data(offset));
-				//cerr << this << ' ' << name() << " @ " << offset << " inport " << in_index << " = buf " 
-				//     << min((uint32_t)in_index,nbufs) << " = " << &bufs[min((uint32_t)in_index,nbufs)][offset] << endl;
-				in_index++;
-
-
-			} else if (LADSPA_IS_PORT_OUTPUT (port_descriptor (port_index))) {
-				const size_t index = min(out_index,nbufs - 1);
-				connect_port (port_index, bufs.get_audio(index).data(offset));
-				// cerr << this << ' ' << name() << " @ " << offset << " outport " << out_index << " = buf " 
-				//     << min((uint32_t)out_index,nbufs) << " = " << &bufs[min((uint32_t)out_index,nbufs)][offset] << endl;
-				out_index++;
+	cycles_t now;
+	cycles_t then = get_cycles ();
+
+	for (uint32_t port_index = 0; port_index < parameter_count(); ++port_index) {
+		if (LADSPA_IS_PORT_AUDIO(port_descriptor(port_index))) {
+			if (LADSPA_IS_PORT_INPUT(port_descriptor(port_index))) {
+				const uint32_t buf_index = in_map.get(DataType::AUDIO, port_index);
+				connect_port(port_index, bufs.get_audio(buf_index).data(offset));
+			} else if (LADSPA_IS_PORT_OUTPUT(port_descriptor(port_index))) {
+				const uint32_t buf_index = out_map.get(DataType::AUDIO, port_index);
+				connect_port(port_index, bufs.get_audio(buf_index).data(offset));
 			}
 		}
-		port_index++;
 	}
 	
 	run_in_place (nframes);