diff options
| author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2011-11-20 22:54:52 +0000 |
|---|---|---|
| committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2011-11-20 22:54:52 +0000 |
| commit | cdd1d1ee24e161dd2cf1e3ae33cd3014431ebd12 (patch) | |
| tree | 487a7a440edeabd365a255c012645b82b247bbfd /usr.bin/aucat/aucat.c | |
| parent | 96c77bdb257f1973b17a828034fa3a269854e7db (diff) | |
Move mmc/mtc and volume control bits from struct aproc to struct
dev. Allows volume settings to be saved while the device is kept
closed. Besides that, no behabiour changes.
Diffstat (limited to 'usr.bin/aucat/aucat.c')
| -rw-r--r-- | usr.bin/aucat/aucat.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c index ce80ccad1b5..ceb3c06bc37 100644 --- a/usr.bin/aucat/aucat.c +++ b/usr.bin/aucat/aucat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aucat.c,v 1.125 2011/11/15 08:05:22 ratchov Exp $ */ +/* $OpenBSD: aucat.c,v 1.126 2011/11/20 22:54:51 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -582,7 +582,7 @@ main(int argc, char **argv) if (!dev_init(d)) exit(1); if (d->autostart && (d->mode & MODE_AUDIOMASK)) - ctl_start(d->midi); + dev_mmcstart(d); } for (l = listen_list; l != NULL; l = l->next) { if (!listen_init(l)) @@ -608,8 +608,7 @@ main(int argc, char **argv) dnext = d->next; if (!dev_run(d)) goto fatal; - if ((d->mode & MODE_THRU) || - (d->pstate != DEV_CLOSED && !ctl_idle(d->midi))) + if (!dev_idle(d)) active = 1; } if (dev_list == NULL) |