Commit to allow move (broken revision)

git-svn-id: http://svn.drobilla.net/lad/grauph@55 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 10 insertions, 10 deletions

diff --git a/src/libs/engine/DSSIPlugin.cpp b/src/libs/engine/DSSIPlugin.cpp
index ade48d82..8876f797 100644
--- a/src/libs/engine/DSSIPlugin.cpp
+++ b/src/libs/engine/DSSIPlugin.cpp
@@ -38,9 +38,6 @@ DSSIPlugin::DSSIPlugin(const string& name, size_t poly, Patch* parent, DSSI_Desc
   _alsa_events(new snd_seq_event_t[_buffer_size]),
   _alsa_encoder(NULL)
 {
-	if (has_midi_input())
-		_num_ports = descriptor->LADSPA_Plugin->PortCount + 1;
-	
 	snd_midi_event_new(3, &_alsa_encoder);
 }
 
@@ -62,16 +59,19 @@ DSSIPlugin::~DSSIPlugin()
 bool
 DSSIPlugin::instantiate()
 {
-	if (!LADSPAPlugin::instantiate())
-		return false;
+	assert(!_ports);
 	
 	if (has_midi_input()) {
-		assert(_num_ports == _descriptor->PortCount + 1);
-		assert(_ports->size() == _descriptor->PortCount + 1);
-
-		_midi_in_port = new InputPort<MidiMessage>(this, "MIDI In", _num_ports-1, 1, DataType::MIDI, _buffer_size);
-		_ports->at(_num_ports-1) = _midi_in_port;
+		_ports = new Array<Port*>(_descriptor->PortCount + 1);
+		_midi_in_port = new InputPort<MidiMessage>(this, "MIDI In", _ports->size()-1, 1, DataType::MIDI, _buffer_size);
+		_ports->at(_ports->size()-1) = _midi_in_port;
 	}	
+
+	// LADSPAPlugin::instantiate checks if _ports is already allocated
+	if (!LADSPAPlugin::instantiate()) {
+		delete _ports;
+		return false;
+	}
 	
 	return true;
 }