diff options
author | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
commit | 959a7909c1adca430a63f783fd16687242a7be3d (patch) | |
tree | b5048c3cc1bbb60bb680472b97ebba6ebb92d72f /libs/ardour/midi_port.cc | |
parent | 96ca08b9257e4048294cd1804a65d4ae6cd88814 (diff) |
Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).
git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_port.cc')
-rw-r--r-- | libs/ardour/midi_port.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index d7ce12d411..8fbccf17f7 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -61,7 +61,7 @@ MidiPort::cycle_start (jack_nframes_t nframes) void* jack_buffer = jack_port_get_buffer(_port, nframes); const jack_nframes_t event_count - = jack_midi_get_event_count(jack_buffer, nframes); + = jack_midi_get_event_count(jack_buffer); assert(event_count < _buffer.capacity()); @@ -71,7 +71,7 @@ MidiPort::cycle_start (jack_nframes_t nframes) for (jack_nframes_t i=0; i < event_count; ++i) { // This will fail to compile if we change MidiEvent to our own class - jack_midi_event_get(static_cast<jack_midi_event_t*>(&ev), jack_buffer, i, nframes); + jack_midi_event_get(static_cast<jack_midi_event_t*>(&ev), jack_buffer, i); _buffer.push_back(ev); // Convert note ons with velocity 0 to proper note offs @@ -103,11 +103,11 @@ MidiPort::cycle_end() //if (event_count > 0) // cerr << "MIDIPort writing " << event_count << " events." << endl; - jack_midi_clear_buffer(jack_buffer, _nframes_this_cycle); + jack_midi_clear_buffer(jack_buffer); for (jack_nframes_t i=0; i < event_count; ++i) { const jack_midi_event_t& ev = _buffer[i]; assert(ev.time < _nframes_this_cycle); - jack_midi_event_write(jack_buffer, ev.time, ev.buffer, ev.size, _nframes_this_cycle); + jack_midi_event_write(jack_buffer, ev.time, ev.buffer, ev.size); } _nframes_this_cycle = 0; |