Skip to content

Commit

Permalink
Merge pull request #177 from Mindwerks/polish
Browse files Browse the repository at this point in the history 
cosmetic change for readability
  • Loading branch information
@psi29a
psi29a authored Aug 4, 2017
2 parents 814f31d + a83ebc9 commit dffc4ff
Showing 1 changed file with 60 additions and 60 deletions.
120 changes: 60 additions & 60 deletions src/internal_midi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,7 @@ void _WM_freeMDI(struct _mdi *mdi) {
free(mdi);
}

uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inlen, uint8_t running_event) {
uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t input_length, uint8_t running_event) {
/*
Only add standard MIDI and Sysex events in here.
Non-standard events need to be handled by calling function
Expand All @@ -1978,13 +1978,13 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
uint8_t data_2 = 0;
char *text = NULL;

if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;

if (event_data[0] >= 0x80) {
command = *event_data & 0xf0;
channel = *event_data++ & 0x0f;
ret_cnt++;
if (--inlen == 0) goto shortbuf;
if (--input_length == 0) goto shortbuf;
} else {
command = running_event & 0xf0;
channel = running_event & 0x0f;
Expand All @@ -1993,29 +1993,29 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
switch(command) {
case 0x80:
_SETUP_NOTEOFF:
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
data_1 = *event_data++;
data_2 = *event_data++;
_WM_midi_setup_noteoff(mdi, channel, data_1, data_2);
ret_cnt += 2;
break;
case 0x90:
if (event_data[1] == 0) goto _SETUP_NOTEOFF; /* A velocity of 0 in a note on is actually a note off */
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
data_1 = *event_data++;
data_2 = *event_data++;
midi_setup_noteon(mdi, channel, data_1, data_2);
ret_cnt += 2;
break;
case 0xa0:
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
data_1 = *event_data++;
data_2 = *event_data++;
midi_setup_aftertouch(mdi, channel, data_1, data_2);
ret_cnt += 2;
break;
case 0xb0:
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
data_1 = *event_data++;
data_2 = *event_data++;
midi_setup_control(mdi, channel, data_1, data_2);
Expand All @@ -2032,7 +2032,7 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
ret_cnt++;
break;
case 0xe0:
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
data_1 = *event_data++;
data_2 = *event_data++;
midi_setup_pitch(mdi, channel, ((data_2 << 7) | (data_1 & 0x7f)));
Expand All @@ -2049,28 +2049,28 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
Sequence Number
We only setting this up here for WM_Event2Midi function
*/
if (inlen < 4) goto shortbuf;
if (input_length < 4) goto shortbuf;
midi_setup_sequenceno(mdi, ((event_data[2] << 8) + event_data[3]));
ret_cnt += 4;
} else if (event_data[0] == 0x01) {
/* Text Event */
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2085,20 +2085,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

/* Copy copyright info in the getinfo struct */
Expand Down Expand Up @@ -2126,20 +2126,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2154,20 +2154,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2182,20 +2182,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2210,20 +2210,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2238,20 +2238,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
/* Get Length */
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
ret_cnt++;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
if (!tmp_length) break;/* broken file? */

text = malloc(tmp_length + 1);
Expand All @@ -2266,15 +2266,15 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
Channel Prefix
We only setting this up here for WM_Event2Midi function
*/
if (inlen < 3) goto shortbuf;
if (input_length < 3) goto shortbuf;
midi_setup_channelprefix(mdi, event_data[2]);
ret_cnt += 3;
} else if ((event_data[0] == 0x21) && (event_data[1] == 0x01)) {
/*
Port Prefix
We only setting this up here for WM_Event2Midi function
*/
if (inlen < 3) goto shortbuf;
if (input_length < 3) goto shortbuf;
midi_setup_portprefix(mdi, event_data[2]);
ret_cnt += 3;
} else if ((event_data[0] == 0x2F) && (event_data[1] == 0x00)) {
Expand All @@ -2283,7 +2283,7 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
Deal with this inside calling function
We only setting this up here for _WM_Event2Midi function
*/
if (inlen < 2) goto shortbuf;
if (input_length < 2) goto shortbuf;
_WM_midi_setup_endoftrack(mdi);
ret_cnt += 2;
} else if ((event_data[0] == 0x51) && (event_data[1] == 0x03)) {
Expand All @@ -2292,11 +2292,11 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
Deal with this inside calling function.
We only setting this up here for _WM_Event2Midi function
*/
if (inlen < 5) goto shortbuf;
if (input_length < 5) goto shortbuf;
_WM_midi_setup_tempo(mdi, ((event_data[2] << 16) + (event_data[3] << 8) + event_data[4]));
ret_cnt += 5;
} else if ((event_data[0] == 0x54) && (event_data[1] == 0x05)) {
if (inlen < 7) goto shortbuf;
if (input_length < 7) goto shortbuf;
/*
SMPTE Offset
We only setting this up here for WM_Event2Midi function
Expand All @@ -2314,15 +2314,15 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
Time Signature
We only setting this up here for WM_Event2Midi function
*/
if (inlen < 6) goto shortbuf;
if (input_length < 6) goto shortbuf;
midi_setup_timesignature(mdi, ((event_data[2] << 24) + (event_data[3] << 16) + (event_data[4] << 8) + event_data[5]));
ret_cnt += 6;
} else if ((event_data[0] == 0x59) && (event_data[1] == 0x02)) {
/*
Key Signature
We only setting this up here for WM_Event2Midi function
*/
if (inlen < 4) goto shortbuf;
if (input_length < 4) goto shortbuf;
midi_setup_keysignature(mdi, ((event_data[2] << 8) + event_data[3]));
ret_cnt += 4;
} else {
Expand All @@ -2331,20 +2331,20 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl
*/
event_data++;
ret_cnt++;
if (--inlen && *event_data > 0x7f) {
if (--input_length && *event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
tmp_length = (tmp_length << 7) + (*event_data & 0x7f);
ret_cnt++;
ret_cnt += tmp_length;
if (--inlen < tmp_length) goto shortbuf;
if (--input_length < tmp_length) goto shortbuf;
}

} else if ((channel == 0) || (channel == 7)) {
Expand All @@ -2356,18 +2356,18 @@ uint32_t _WM_SetupMidiEvent(struct _mdi *mdi, uint8_t * event_data, uint32_t inl

if (*event_data > 0x7f) {
do {
if (!inlen) break;
if (!input_length) break;
sysex_len = (sysex_len << 7) + (*event_data & 0x7F);
event_data++;
inlen--;
input_length--;
ret_cnt++;
} while (*event_data > 0x7f);
}
if (!inlen) goto shortbuf;
if (!input_length) goto shortbuf;
sysex_len = (sysex_len << 7) + (*event_data & 0x7F);
event_data++;
ret_cnt++;
if (--inlen < sysex_len) goto shortbuf;
if (--input_length < sysex_len) goto shortbuf;
if (!sysex_len) break;/* broken file? */

sysex_store = malloc(sizeof(uint8_t) * sysex_len);
Expand Down

0 comments on commit dffc4ff

Please sign in to comment.