diff options
author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2010-01-14 17:43:56 +0000 |
---|---|---|
committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2010-01-14 17:43:56 +0000 |
commit | 4e433dfed61894d01df71c5ed60ca97083c870aa (patch) | |
tree | 394fc306e0b21d65401c39e167996b6e8220267d | |
parent | 431b501696bc7236b327ee44aad403c34e8e1ccd (diff) |
Use -C option to specify recorded channel range instead of -c which
is for played channels.
spotted by Jan Stary <hans at stare.cz>, thanks
-rw-r--r-- | usr.bin/aucat/aucat.c | 4 | ||||
-rw-r--r-- | usr.bin/aucat/wav.c | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c index e43e43eeec4..f7a06997f4d 100644 --- a/usr.bin/aucat/aucat.c +++ b/usr.bin/aucat/aucat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aucat.c,v 1.79 2010/01/11 13:06:32 ratchov Exp $ */ +/* $OpenBSD: aucat.c,v 1.80 2010/01/14 17:43:55 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -542,7 +542,7 @@ aucat_main(int argc, char **argv) fa = SLIST_FIRST(&ofiles); SLIST_REMOVE_HEAD(&ofiles, entry); if (!wav_new_out(&wav_ops, fa->name, - fa->hdr, &fa->ipar, fa->xrun)) + fa->hdr, &fa->opar, fa->xrun)) free(fa); } while (!SLIST_EMPTY(&sfiles)) { diff --git a/usr.bin/aucat/wav.c b/usr.bin/aucat/wav.c index aa6c7670341..e811c61aa6b 100644 --- a/usr.bin/aucat/wav.c +++ b/usr.bin/aucat/wav.c @@ -373,6 +373,14 @@ wav_new_in(struct fileops *ops, char *name, unsigned hdr, abuf_fill(buf); /* XXX: move this in dev_attach() ? */ dev_attach(name, buf, par, xrun, NULL, NULL, 0, ADATA_UNIT); dev_setvol(buf, MIDI_TO_ADATA(volctl)); +#ifdef DEBUG + if (debug_level >= 2) { + dbg_puts(name); + dbg_puts(": playing "); + aparams_dbg(par); + dbg_puts("\n"); + } +#endif return f; } @@ -420,6 +428,14 @@ wav_new_out(struct fileops *ops, char *name, unsigned hdr, buf = abuf_new(nfr, par); aproc_setin(p, buf); dev_attach(name, NULL, NULL, 0, buf, par, xrun, 0); +#ifdef DEBUG + if (debug_level >= 2) { + dbg_puts(name); + dbg_puts(": recording "); + aparams_dbg(par); + dbg_puts("\n"); + } +#endif return f; } |