=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/aucat/Attic/aproc.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- src/usr.bin/aucat/Attic/aproc.c 2009/07/25 08:44:27 1.32 +++ src/usr.bin/aucat/Attic/aproc.c 2009/07/25 10:52:18 1.33 @@ -1,4 +1,4 @@ -/* $OpenBSD: aproc.c,v 1.32 2009/07/25 08:44:27 ratchov Exp $ */ +/* $OpenBSD: aproc.c,v 1.33 2009/07/25 10:52:18 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov * @@ -49,10 +49,10 @@ #include #include -#include "conf.h" -#include "aparams.h" #include "abuf.h" +#include "aparams.h" #include "aproc.h" +#include "conf.h" #include "file.h" struct aproc * @@ -366,7 +366,7 @@ /* * Append the given amount of silence (or less if there's not enough - * space), and crank mixitodo accordingly + * space), and crank mixitodo accordingly. */ void mix_bzero(struct abuf *obuf, unsigned zcount) @@ -398,7 +398,7 @@ obuf->mixitodo, ibuf->mixodone); /* - * calculate the maximum we can read + * Calculate the maximum we can read. */ idata = (short *)abuf_rgetblk(ibuf, &icount, 0); icount /= ibuf->bpf; @@ -406,14 +406,14 @@ return; /* - * zero-fill if necessary + * Zero-fill if necessary. */ zcount = ibuf->mixodone + icount * obuf->bpf; if (zcount > obuf->mixitodo) mix_bzero(obuf, zcount - obuf->mixitodo); /* - * calculate the maximum we can write + * Calculate the maximum we can write. */ odata = (short *)abuf_wgetblk(obuf, &ocount, ibuf->mixodone); ocount /= obuf->bpf; @@ -566,7 +566,7 @@ if (!aproc_inuse(p)) { DPRINTF("mix_eof: %s: from input\n", p->name); /* - * find a blocked input + * Find a blocked input. */ odone = obuf->len; LIST_FOREACH(i, &p->ibuflist, ient) { @@ -578,7 +578,7 @@ odone = i->mixodone; } /* - * no blocked inputs, check if output is blocked + * No blocked inputs. Check if output is blocked. */ if (LIST_EMPTY(&p->ibuflist) || odone == obuf->mixitodo) abuf_run(obuf); @@ -651,7 +651,7 @@ } /* - * Normalize input levels + * Normalize input levels. */ void mix_setmaster(struct aproc *p) @@ -720,7 +720,7 @@ } /* - * Handle buffer overruns, return 0 if the stream died + * Handle buffer overruns. Return 0 if the stream died. */ int sub_xrun(struct abuf *ibuf, struct abuf *i) @@ -841,7 +841,7 @@ if (!aproc_inuse(p)) { DPRINTF("sub_hup: %s: from input\n", p->name); /* - * find a blocked output + * Find a blocked output. */ idone = ibuf->len; LIST_FOREACH(i, &p->obuflist, oent) { @@ -853,7 +853,7 @@ idone = i->subidone; } /* - * no blocked outputs, check if input is blocked + * No blocked outputs. Check if input is blocked. */ if (LIST_EMPTY(&p->obuflist) || idone == ibuf->used) abuf_run(ibuf);