diff options
| author | David Robillard <d@drobilla.net> | 2007-04-07 01:00:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-07 01:00:45 +0000 |
| commit | f5b1168db7f9a9b9c9a3a363bd4fabc0d0382c91 (patch) | |
| tree | cc2ed051056b15428983f52d2cc8235f0c097172 | |
| parent | 0a9336debbf5ae8b434ec4caa68c678fe43fd4da (diff) | |
| download | machina-f5b1168db7f9a9b9c9a3a363bd4fabc0d0382c91.tar.gz machina-f5b1168db7f9a9b9c9a3a363bd4fabc0d0382c91.tar.bz2 machina-f5b1168db7f9a9b9c9a3a363bd4fabc0d0382c91.zip | |
Jack MIDI API fixes.
git-svn-id: http://svn.drobilla.net/lad/machina@409 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/engine/JackDriver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index f98b095..39061ed 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -121,11 +121,11 @@ JackDriver::process_input(SharedPtr<Machine> machine, const TimeSlice& time) const jack_nframes_t nframes = time.length_ticks(); void* jack_buffer = jack_port_get_buffer(_input_port, nframes); - const jack_nframes_t event_count = jack_midi_get_event_count(jack_buffer, nframes); + const jack_nframes_t event_count = jack_midi_get_event_count(jack_buffer); for (jack_nframes_t i=0; i < event_count; ++i) { jack_midi_event_t ev; - jack_midi_event_get(&ev, jack_buffer, i, nframes); + jack_midi_event_get(&ev, jack_buffer, i); _recorder->write(_record_time + ev.time, ev.size, ev.buffer); } @@ -137,11 +137,11 @@ JackDriver::process_input(SharedPtr<Machine> machine, const TimeSlice& time) const jack_nframes_t nframes = time.length_ticks(); void* jack_buffer = jack_port_get_buffer(_input_port, nframes); - const jack_nframes_t event_count = jack_midi_get_event_count(jack_buffer, nframes); + const jack_nframes_t event_count = jack_midi_get_event_count(jack_buffer); for (jack_nframes_t i=0; i < event_count; ++i) { jack_midi_event_t ev; - jack_midi_event_get(&ev, jack_buffer, i, nframes); + jack_midi_event_get(&ev, jack_buffer, i); if (ev.buffer[0] == 0x90) { @@ -206,7 +206,7 @@ JackDriver::write_event(Raul::BeatTime time, } else { jack_midi_event_write( jack_port_get_buffer(_output_port, nframes), offset, - event, size, nframes); + event, size); } } @@ -221,7 +221,7 @@ JackDriver::on_process(jack_nframes_t nframes) _cycle_time.set_length(nframes); assert(_output_port); - jack_midi_clear_buffer(jack_port_get_buffer(_output_port, nframes), nframes); + jack_midi_clear_buffer(jack_port_get_buffer(_output_port, nframes)); /* Take a reference to machine here and use only it during the process * cycle so _machine can be switched with set_machine during a cycle. */ |