diff options
| -rw-r--r-- | usr.bin/aucat/aproc.c | 14 | ||||
| -rw-r--r-- | usr.bin/aucat/midi.c | 4 | ||||
| -rw-r--r-- | usr.bin/aucat/sock.c | 10 |
3 files changed, 15 insertions, 13 deletions
diff --git a/usr.bin/aucat/aproc.c b/usr.bin/aucat/aproc.c index c642088ed4c..0d7a49fae0e 100644 --- a/usr.bin/aucat/aproc.c +++ b/usr.bin/aucat/aproc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aproc.c,v 1.60 2010/10/21 18:57:42 ratchov Exp $ */ +/* $OpenBSD: aproc.c,v 1.61 2010/10/21 19:10:52 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -970,9 +970,9 @@ mix_newout(struct aproc *p, struct abuf *obuf) #ifdef DEBUG if (debug_level >= 3) { aproc_dbg(p); - dbg_puts(": newin, will use "); + dbg_puts(": newout, will use "); dbg_putu(obuf->len); - dbg_puts("\n"); + dbg_puts(" fr\n"); } #endif obuf->w.mix.todo = 0; @@ -1494,7 +1494,7 @@ resamp_bcopy(struct aproc *p, struct abuf *ibuf, struct abuf *obuf) #ifdef DEBUG if (debug_level >= 4) { aproc_dbg(p); - dbg_puts(": resamp starting diff = "); + dbg_puts(": starting diff = "); dbg_puti(diff); dbg_puts(", ifr = "); dbg_putu(ifr); @@ -1552,7 +1552,7 @@ resamp_bcopy(struct aproc *p, struct abuf *ibuf, struct abuf *obuf) #ifdef DEBUG if (debug_level >= 4) { aproc_dbg(p); - dbg_puts(": resamp done delta = "); + dbg_puts(": done delta = "); dbg_puti(diff); dbg_puts(", ifr = "); dbg_putu(ifr); @@ -2126,7 +2126,7 @@ join_new(char *name) #ifdef DEBUG if (debug_level >= 3) { aproc_dbg(p); - dbg_puts("\n"); + dbg_puts(": new\n"); } #endif return p; @@ -2177,7 +2177,7 @@ mon_snoop(struct aproc *p, struct abuf *ibuf, unsigned pos, unsigned todo) #ifdef DEBUG if (debug_level >= 4) { aproc_dbg(p); - dbg_puts(": snoop "); + dbg_puts(": snooping "); dbg_putu(pos); dbg_puts(".."); dbg_putu(todo); diff --git a/usr.bin/aucat/midi.c b/usr.bin/aucat/midi.c index 8001f118182..e56a4bcb97e 100644 --- a/usr.bin/aucat/midi.c +++ b/usr.bin/aucat/midi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi.c,v 1.29 2010/10/21 18:57:42 ratchov Exp $ */ +/* $OpenBSD: midi.c,v 1.30 2010/10/21 19:10:52 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -564,7 +564,7 @@ ctl_getidx(struct aproc *p, char *who) #ifdef DEBUG if (debug_level >= 1) { dbg_puts(name); - dbg_puts(": too many instances"); + dbg_puts(": too many instances\n"); } #endif return -1; diff --git a/usr.bin/aucat/sock.c b/usr.bin/aucat/sock.c index c6c9c59568a..02661970bed 100644 --- a/usr.bin/aucat/sock.c +++ b/usr.bin/aucat/sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sock.c,v 1.51 2010/10/21 18:57:42 ratchov Exp $ */ +/* $OpenBSD: sock.c,v 1.52 2010/10/21 19:10:52 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -492,7 +492,9 @@ sock_startreq(void *arg) } #endif (void)sock_attach(f, 0); -}/* +} + +/* * Callback invoked by MMC stop */ void @@ -1214,11 +1216,11 @@ sock_execmsg(struct sock *f) #endif aproc_del(f->pipe.file.rproc); return 0; + } /* * XXX: device could have desappeared at this point, * see how this is fixed in wav.c */ - } if ((f->pstate == SOCK_START || f->pstate == SOCK_READY) && ctl_slotstart(f->dev->midi, f->slot)) (void)sock_attach(f, 1); @@ -1605,7 +1607,7 @@ sock_read(struct sock *f) } /* * XXX: sock_attach() may not start if there's not enough - * samples queues, if so ctl_slotstart() will trigger + * samples queued, if so ctl_slotstart() will trigger * other streams, but this one won't start. */ if (f->pstate == SOCK_READY && ctl_slotstart(f->dev->midi, f->slot)) |