Handle all streams the same way because there's no actual

difference between audio files and client connections. Clean up
the way command line options are handled and clarify this in the
manual page: stream parameters (-Ccehjmrtvx) must precede stream
definitions (-ios) and per-device parameters (-abz) and stream
definitions (-ios) must precede device definitions (-f). Since
there's no ``server'' and ``non-server'' modes anymore, make the
-l option just detach the process.

ok and help from jakemsr and jmc

1 files changed, 4 insertions, 1 deletions

diff --git a/usr.bin/aucat/opt.c b/usr.bin/aucat/opt.c
index 6ab06ce677c..4e14b81e391 100644
--- a/usr.bin/aucat/opt.c
+++ b/usr.bin/aucat/opt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opt.c,v 1.9 2010/06/04 06:15:28 ratchov Exp $	*/
+/*	$OpenBSD: opt.c,v 1.10 2010/07/06 01:12:45 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "dev.h"
 #include "conf.h"
 #include "opt.h"
 #ifdef DEBUG
@@ -72,6 +73,8 @@ opt_new(char *name, struct dev *d, struct aparams *wpar, struct aparams *rpar,
 #ifdef DEBUG
 	if (debug_level >= 2) {
 		dbg_puts(o->name);
+		dbg_puts("@");
+		dbg_puts(o->dev->path);
 		dbg_puts(":");
 		if (mode & MODE_REC) {
 			dbg_puts(" rec=");