ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drain midi port output buffer before closing it ensuring the last 

few bytes are not lost
This commit is contained in:
Alexandre Ratchov 2012-11-30 23:27:36 +01:00
parent 0057424c2b
commit 7a76f322eb
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sndiod/midi.c
View File

@ -519,7 +519,7 @@ port_unref(struct port *c)
for (rxmask = 0, i = 0; i < MIDI_NEP; i++)
rxmask |= midi_ep[i].txmask;
if ((rxmask & c->midi->self) == 0 && c->state == PORT_INIT && !c->hold)
port_close(c);
port_drain(c);
}
struct port *
@ -572,6 +572,24 @@ port_close(struct port *c)
return 1;
}
void
port_drain(struct port *c)
{
struct midi *ep = c->midi;
if (!(ep->mode & MODE_MIDIOUT) || ep->obuf.used == 0)
port_close(c);
else {
c->state = PORT_DRAIN;
#ifdef DEBUG
if (log_level >= 3) {
port_log(c);
log_puts(": draining\n");
}
#endif
}
}
int
port_init(struct port *c)
{
@ -583,7 +601,6 @@ port_init(struct port *c)
void
port_done(struct port *c)
{
/* XXX: drain? */
if (c->state != PORT_CFG)
port_close(c);
if (c->state == PORT_INIT)
port_drain(c);
}

1
sndiod/midi.h
View File

@ -117,6 +117,7 @@ int port_ref(struct port *);
void port_unref(struct port *);
int port_init(struct port *);
void port_done(struct port *);
void port_drain(struct port *);
int port_close(struct port *);
#endif /* !defined(MIDI_H) */

2
sndiod/miofile.c
View File

@ -118,6 +118,8 @@ port_mio_out(void *arg)
if (n < count)
break;
}
if (p->state == PORT_DRAIN && ep->obuf.used == 0)
port_close(p);
midi_fill(ep);
}