Browse Source

Correct ALSA midi driver with new MIDI API

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1778 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.70
sletz 18 years ago
parent
commit
71e695f85a
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      linux/alsa/alsa_rawmidi.c
  2. +2
    -2
      linux/alsa/midi_unpack.h

+ 3
- 3
linux/alsa/alsa_rawmidi.c View File

@@ -762,7 +762,7 @@ void jack_process(midi_stream_t *str, jack_nframes_t nframes)

proc.buffer = jack_port_get_buffer(port->jack, nframes);
if (str->mode == POLLIN)
jack_midi_clear_buffer(proc.buffer, 0);
jack_midi_clear_buffer(proc.buffer);

if (port->state == PORT_REMOVED_FROM_MIDI) {
port->state = PORT_REMOVED_FROM_JACK; // this signals to scan thread
@@ -1070,7 +1070,7 @@ static
void do_jack_output(process_jack_t *proc)
{
output_port_t *port = (output_port_t*) proc->port;
int nevents = jack_midi_get_event_count(proc->buffer, 0);
int nevents = jack_midi_get_event_count(proc->buffer);
int i;
if (nevents)
debug_log("jack_out: %d events in %s\n", nevents, port->base.name);
@@ -1078,7 +1078,7 @@ void do_jack_output(process_jack_t *proc)
jack_midi_event_t event;
event_head_t hdr;

jack_midi_event_get(&event, proc->buffer, i, 0);
jack_midi_event_get(&event, proc->buffer, i);

if (jack_ringbuffer_write_space(port->base.data_ring) < event.size || jack_ringbuffer_write_space(port->base.event_ring) < sizeof(hdr)) {
debug_log("jack_out: output buffer overflow on %s\n", port->base.name);


+ 2
- 2
linux/alsa/midi_unpack.h View File

@@ -74,7 +74,7 @@ int midi_unpack_buf(midi_unpack_t *buf, const unsigned char *data, int len, void
const unsigned char byte = data[i];
if (byte >= 0xF8) // system realtime
{
jack_midi_event_write(jack_port_buf, time, &data[i], 1, 0);
jack_midi_event_write(jack_port_buf, time, &data[i], 1);
//printf("midi_unpack: written system relatime event\n");
//midi_input_write(in, &data[i], 1);
}
@@ -118,7 +118,7 @@ int midi_unpack_buf(midi_unpack_t *buf, const unsigned char *data, int len, void
temp[1] = buf->data[1];
jack_midi_event_write(jack_port_buf, time, temp, 3, 0);
} else
jack_midi_event_write(jack_port_buf, time, &buf->data[0], buf->pos, 0);
jack_midi_event_write(jack_port_buf, time, &buf->data[0], buf->pos);
//printf("midi_unpack: written %d-byte event\n", buf->pos);
//midi_input_write(in, &buf->data[0], buf->pos);
}


Loading…
Cancel
Save