aucat (server):

  - make the ``-m mode'' option per subdevice, allowing
    subdevices to be play-only or rec-only even if the
    server is full-duplex

  - add ``monitoring'' mode (with ``-m mon''). This is a
    record-only stream from which played streams can be
    recorded (kind of ``record what you hear'').

  - allow MIDI devices to be subscribed to the controlling
    MIDI port of the server, ie what midicat does (with -f
    option), but using the -q option.

  - add flow control to the protocol, and serialize clock
    ticks (sio_onmove() calls) and data chunks.  This should
    fix certain full-duplex programs, broken with ``magic''
    block/buffer size combinations.

  - enable 3 block latency which is the minimum theoretical.
    Make -z and -b options correspond to device parameters.

  - make sio_getcap(3) the same for aucat and sun backends,
    ie return whatever is supported (``everything'' in the
    aucat case, since everything is actulally supported).

aucat (player):

  - enable ``-m mode'' option  to select between monitoring
    and recording when ``-o file'' is used.

  - plug MIDI code to non-server codepath. The MIDI control
    device is specified with the ``-q device'' option, as in
    server mode.

  - impliment lseek()'ing within files (controlled
    through MIDI). Necessary to use aucat with a MIDI
    sequencer.

midicat (thrubox):

  - rename ``-f'' flag to ``-q'', so it has the
    same name as in aucat (-f is still working)

ok jakemsr@, tweaks from jmc@

1 files changed, 8 insertions, 3 deletions

diff --git a/usr.bin/aucat/sock.h b/usr.bin/aucat/sock.h
index bc6e62a1da4..abeb61f1c4e 100644
--- a/usr.bin/aucat/sock.h
+++ b/usr.bin/aucat/sock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sock.h,v 1.14 2010/04/03 17:59:17 ratchov Exp $	*/
+/*	$OpenBSD: sock.h,v 1.15 2010/04/06 20:07:01 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -30,6 +30,8 @@ struct sock {
 	 * to decode/encode messages in the stream.
 	 */
 	struct amsg rmsg, wmsg;		/* messages being sent/received */
+	unsigned wmax;			/* max frames we're allowed to write */
+	unsigned rmax;			/* max frames we're allowed to read */
 	unsigned rtodo;			/* input bytes not read yet */
 	unsigned wtodo;			/* output bytes not written yet */
 #define SOCK_RDATA	0		/* data chunk being read */
@@ -43,14 +45,17 @@ struct sock {
 #define SOCK_HELLO	0		/* waiting for HELLO message */
 #define SOCK_INIT	1		/* parameter negotiation */
 #define SOCK_START	2		/* filling play buffers */
-#define SOCK_RUN	3		/* attached to the mix / sub */
-#define SOCK_MIDI	4		/* raw byte stream (midi) */
+#define SOCK_READY	3		/* play buffers full */
+#define SOCK_RUN	4		/* attached to the mix / sub */
+#define SOCK_STOP	5		/* draining rec buffers */
+#define SOCK_MIDI	6		/* raw byte stream (midi) */
 	unsigned pstate;		/* one of the above */
 	unsigned mode;			/* a set of AMSG_PLAY, AMSG_REC */
 	struct aparams rpar;		/* read (ie play) parameters */
 	struct aparams wpar;		/* write (ie rec) parameters */
 	int delta;			/* pos. change to send */
 	int tickpending;		/* delta waiting to be transmitted */
+	int startpending;		/* initial delta waiting to be transmitted */
 	unsigned walign;		/* align data packets to this */
 	unsigned bufsz;			/* total buffer size */
 	unsigned round;			/* block size */