summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-02-10 20:48:54 +0000
committerDavid Robillard <d@drobilla.net>2007-02-10 20:48:54 +0000
commit2f652fcefc7e7bfe3b9c3b56172a2d69ee604cbf (patch)
tree9bed2d012b04c729e0370a36904d3ba205e15954
parent69de9f5364094e0cafe818a4a1e5af96f8a42a07 (diff)
downloadingen-2f652fcefc7e7bfe3b9c3b56172a2d69ee604cbf.tar.gz
ingen-2f652fcefc7e7bfe3b9c3b56172a2d69ee604cbf.tar.bz2
ingen-2f652fcefc7e7bfe3b9c3b56172a2d69ee604cbf.zip
Alsa compile fixes.
Removed unecessary MIDI normalization in Jack MIDI driver. git-svn-id: http://svn.drobilla.net/lad/ingen@301 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/libs/engine/AlsaMidiDriver.cpp4
-rw-r--r--src/libs/engine/JackMidiDriver.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index 47566880..81f9ccc5 100644
--- a/src/libs/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
@@ -322,11 +322,11 @@ AlsaMidiDriver::remove_port(const Path& path)
for (Raul::List<AlsaMidiPort*>::iterator i = _in_ports.begin(); i != _in_ports.end(); ++i)
if ((*i)->patch_port()->path() == path)
- return _in_ports.remove(i)->elem();
+ return _in_ports.erase(i)->elem(); // FIXME: leak
for (Raul::List<AlsaMidiPort*>::iterator i = _out_ports.begin(); i != _out_ports.end(); ++i)
if ((*i)->patch_port()->path() == path)
- return _out_ports.remove(i)->elem();
+ return _out_ports.erase(i)->elem(); // FIXME: leak
cerr << "[AlsaMidiDriver::remove_port] WARNING: Failed to find Jack port to remove!" << endl;
return NULL;
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index 1fa2b1a6..304e2474 100644
--- a/src/libs/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
@@ -82,10 +82,6 @@ JackMidiPort::prepare_block(const SampleCount block_start, const SampleCount blo
jack_midi_event_t* ev = (jack_midi_event_t*)&_patch_port->buffer(0)->value_at(i);
jack_midi_event_get(ev, jack_buffer, i, nframes);
- // Convert note ons with velocity 0 to proper note offs
- if (ev->buffer[0] == MIDI_CMD_NOTE_ON && ev->buffer[2] == 0)
- ev->buffer[0] = MIDI_CMD_NOTE_OFF;
-
// MidiMessage and jack_midi_event_t* are the same thing :/
MidiMessage* const message = &_patch_port->buffer(0)->data()[i];
message->time = ev->time;