mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

seq_midi_event: fix encoding of data bytes after end of sysex

Browse source 
Create a new state ST_INVALID for the encoder to prevent data bytes at
the beginning of a stream or after a sysex message being interpreted as
note-off parameters.
This commit is contained in:
Clemens Ladisch 2007-08-10 09:38:47 +02:00
parent c7e1676dcd
commit 2c281e1648
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/seq/seq_midi_event.c
View file

@ -45,10 +45,9 @@ struct snd_midi_event {
}; };
/* queue type */ /* event type, index into status_event[] */
/* from 0 to 7 are normal commands (note off, on, etc.) */ /* from 0 to 6 are normal commands (note off, on, etc.) for 0x8?-0xe? */
#define ST_NOTEOFF 0 #define ST_INVALID 7
#define ST_NOTEON 1
#define ST_SPECIAL 8 #define ST_SPECIAL 8
#define ST_SYSEX ST_SPECIAL #define ST_SYSEX ST_SPECIAL
/* from 8 to 15 are events for 0xf0-0xf7 */ /* from 8 to 15 are events for 0xf0-0xf7 */
@ -85,7 +84,7 @@ static struct status_event_list_t {
event_encode_t encode; event_encode_t encode;
event_decode_t decode; event_decode_t decode;
} status_event[] = { } status_event[] = {
/* 0x80 - 0xf0 */ /* 0x80 - 0xef */
{SND_SEQ_EVENT_NOTEOFF, 2, note_event, note_decode}, {SND_SEQ_EVENT_NOTEOFF, 2, note_event, note_decode},
{SND_SEQ_EVENT_NOTEON, 2, note_event, note_decode}, {SND_SEQ_EVENT_NOTEON, 2, note_event, note_decode},
{SND_SEQ_EVENT_KEYPRESS, 2, note_event, note_decode}, {SND_SEQ_EVENT_KEYPRESS, 2, note_event, note_decode},
@ -93,7 +92,8 @@ static struct status_event_list_t {
{SND_SEQ_EVENT_PGMCHANGE, 1, one_param_ctrl_event, one_param_decode}, {SND_SEQ_EVENT_PGMCHANGE, 1, one_param_ctrl_event, one_param_decode},
{SND_SEQ_EVENT_CHANPRESS, 1, one_param_ctrl_event, one_param_decode}, {SND_SEQ_EVENT_CHANPRESS, 1, one_param_ctrl_event, one_param_decode},
{SND_SEQ_EVENT_PITCHBEND, 2, pitchbend_ctrl_event, pitchbend_decode}, {SND_SEQ_EVENT_PITCHBEND, 2, pitchbend_ctrl_event, pitchbend_decode},
{SND_SEQ_EVENT_NONE, 0, NULL, NULL}, /* 0xf0 */ /* invalid */
{SND_SEQ_EVENT_NONE, 0, NULL, NULL},
/* 0xf0 - 0xff */ /* 0xf0 - 0xff */
{SND_SEQ_EVENT_SYSEX, 1, NULL, NULL}, /* sysex: 0xf0 */ {SND_SEQ_EVENT_SYSEX, 1, NULL, NULL}, /* sysex: 0xf0 */
{SND_SEQ_EVENT_QFRAME, 1, one_param_event, one_param_decode}, /* 0xf1 */ {SND_SEQ_EVENT_QFRAME, 1, one_param_event, one_param_decode}, /* 0xf1 */
@ -153,6 +153,7 @@ int snd_midi_event_new(size_t bufsize, snd_midi_event_t **rdev)
} }
dev->bufsize = bufsize; dev->bufsize = bufsize;
dev->lastcmd = 0xff; dev->lastcmd = 0xff;
dev->type = ST_INVALID;
*rdev = dev; *rdev = dev;
return 0; return 0;
} }
@ -191,7 +192,7 @@ inline static void reset_encode(snd_midi_event_t *dev)
{ {
dev->read = 0; dev->read = 0;
dev->qlen = 0; dev->qlen = 0;
dev->type = 0; dev->type = ST_INVALID;
} }
/** /**