From c758cdf4f6e959b92683f2dba6ce8617ac4f0a83 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 23 Feb 2016 10:15:45 -0500 Subject: uncrustification of jack source code --- drivers/alsa_midi/midi_unpack.h | 87 ++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 48 deletions(-) (limited to 'drivers/alsa_midi/midi_unpack.h') diff --git a/drivers/alsa_midi/midi_unpack.h b/drivers/alsa_midi/midi_unpack.h index c917f4d..7573a54 100644 --- a/drivers/alsa_midi/midi_unpack.h +++ b/drivers/alsa_midi/midi_unpack.h @@ -32,7 +32,7 @@ typedef struct { } midi_unpack_t; static inline -void midi_unpack_init(midi_unpack_t *u) +void midi_unpack_init (midi_unpack_t *u) { u->pos = 0; u->size = sizeof(u->data); @@ -40,102 +40,93 @@ void midi_unpack_init(midi_unpack_t *u) } static inline -void midi_unpack_reset(midi_unpack_t *u) +void midi_unpack_reset (midi_unpack_t *u) { u->pos = 0; u->need = u->size; } static const unsigned char midi_voice_len[] = { - 3, /*0x80 Note Off*/ - 3, /*0x90 Note On*/ - 3, /*0xA0 Aftertouch*/ - 3, /*0xB0 Control Change*/ - 2, /*0xC0 Program Change*/ - 2, /*0xD0 Channel Pressure*/ - 3, /*0xE0 Pitch Wheel*/ - 1 /*0xF0 System*/ + 3, /*0x80 Note Off*/ + 3, /*0x90 Note On*/ + 3, /*0xA0 Aftertouch*/ + 3, /*0xB0 Control Change*/ + 2, /*0xC0 Program Change*/ + 2, /*0xD0 Channel Pressure*/ + 3, /*0xE0 Pitch Wheel*/ + 1 /*0xF0 System*/ }; static const unsigned char midi_system_len[] = { - 0, /*0xF0 System Exclusive Start*/ - 2, /*0xF1 MTC Quarter Frame*/ - 3, /*0xF2 Song Postion*/ - 2, /*0xF3 Song Select*/ - 0, /*0xF4 undefined*/ - 0, /*0xF5 undefined*/ - 1, /*0xF6 Tune Request*/ - 1 /*0xF7 System Exlusive End*/ + 0, /*0xF0 System Exclusive Start*/ + 2, /*0xF1 MTC Quarter Frame*/ + 3, /*0xF2 Song Postion*/ + 2, /*0xF3 Song Select*/ + 0, /*0xF4 undefined*/ + 0, /*0xF5 undefined*/ + 1, /*0xF6 Tune Request*/ + 1 /*0xF7 System Exlusive End*/ }; static -int midi_unpack_buf(midi_unpack_t *buf, const unsigned char *data, int len, void *jack_port_buf, jack_nframes_t time) +int midi_unpack_buf (midi_unpack_t *buf, const unsigned char *data, int len, void *jack_port_buf, jack_nframes_t time) { int i; - for (i=0; i= 0xF8) // system realtime - { - jack_midi_event_write(jack_port_buf, time, &data[i], 1); + if (byte >= 0xF8) { // system realtime + jack_midi_event_write (jack_port_buf, time, &data[i], 1); //jack_error("midi_unpack: written system relatime event\n"); //midi_input_write(in, &data[i], 1); - } - else if (byte < 0x80) // data - { + } else if (byte < 0x80) { // data assert (buf->pos < buf->size); buf->data[buf->pos++] = byte; - } - else if (byte < 0xF0) // voice - { + } else if (byte < 0xF0) { // voice assert (byte >= 0x80 && byte < 0xF0); //buf->need = ((byte|0x0F) == 0xCF || (byte|0x0F)==0xDF) ? 2 : 3; - buf->need = midi_voice_len[(byte-0x80)>>4]; + buf->need = midi_voice_len[(byte - 0x80) >> 4]; buf->data[0] = byte; buf->pos = 1; - } - else if (byte == 0xF7) // sysex end - { + } else if (byte == 0xF7) { // sysex end assert (buf->pos < buf->size); buf->data[buf->pos++] = byte; buf->need = buf->pos; - } - else - { + } else { assert (byte >= 0xF0 && byte < 0xF8); buf->pos = 1; buf->data[0] = byte; buf->need = midi_system_len[byte - 0xF0]; - if (!buf->need) + if (!buf->need) { buf->need = buf->size; + } } - if (buf->pos == buf->need) - { + if (buf->pos == buf->need) { // TODO: deal with big sysex'es (they are silently dropped for now) - if (buf->data[0] >= 0x80 || (buf->data[0]==0xF0 && buf->data[buf->pos-1] == 0xF7)) { + if (buf->data[0] >= 0x80 || (buf->data[0] == 0xF0 && buf->data[buf->pos - 1] == 0xF7)) { /* convert Note On with velocity 0 to Note Off */ if ((buf->data[0] & 0xF0) == 0x90 && buf->data[2] == 0) { // we use temp array here to keep running status in sync jack_midi_data_t temp[3] = { 0x80, 0, 0x40 }; temp[0] |= buf->data[0] & 0x0F; temp[1] = buf->data[1]; - jack_midi_event_write(jack_port_buf, time, temp, 3); - } else - jack_midi_event_write(jack_port_buf, time, &buf->data[0], buf->pos); + jack_midi_event_write (jack_port_buf, time, temp, 3); + } else { + jack_midi_event_write (jack_port_buf, time, &buf->data[0], buf->pos); + } //jack_error("midi_unpack: written %d-byte event\n", buf->pos); //midi_input_write(in, &buf->data[0], buf->pos); } /* keep running status */ - if (buf->data[0] >= 0x80 && buf->data[0] < 0xF0) + if (buf->data[0] >= 0x80 && buf->data[0] < 0xF0) { buf->pos = 1; - else - { + } else { buf->pos = 0; buf->need = buf->size; } } } - assert (i==len); + assert (i == len); return i; } -- cgit v1.2.1