Currently midi capable programs can control midi hardware, but

cannot cooperate with other programs.  The aim of this change is
to allow any program to send midi data to other programs as they
were midi hardware. For instance, this change should solve the
longstanding problem of using a midi sequencer with software
synthesizers. More precisely:

 - new midicat(1) utility (actually hardlink to aucat(1)).
   it creates software midi thru boxes, allowing programs
   to send midi messages to other programs as they were
   midi(4) hardware.

 - new midi api in libsndio (see mio_open(3)), to access
   midi(4) devices and midicat(1) sockets in a uniform way.

 - new device naming scheme <service>:<unit>[.<option>],
   common to audio and midi.

 - new sndio(7) manual describing concepts and naming

The current audio device naming still works, but people having
scripts or configuration files containing device names could read
the sndio(7) man page and slowly start updating device names.

discussed with jakemsr@ and deraadt@, help form jmc@

1 files changed, 12 insertions, 3 deletions

diff --git a/usr.bin/aucat/abuf.h b/usr.bin/aucat/abuf.h
index c339236db6b..636d32eb5d1 100644
--- a/usr.bin/aucat/abuf.h
+++ b/usr.bin/aucat/abuf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abuf.h,v 1.16 2009/02/13 20:48:49 ratchov Exp $	*/
+/*	$OpenBSD: abuf.h,v 1.17 2009/07/25 08:44:27 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -43,6 +43,13 @@ struct abuf {
 	unsigned xrun;		/* common to mix and sub */
 	LIST_ENTRY(abuf) ient;	/* for mix inputs list */
 	LIST_ENTRY(abuf) oent;	/* for sub outputs list */
+	unsigned mstatus;	/* MIDI running status */
+	unsigned mindex;	/* current MIDI message size */
+	unsigned mused;		/* bytes used from mdata */
+	unsigned mlen;		/* MIDI message length */
+#define MDATA_NMAX 16
+	unsigned char mdata[MDATA_NMAX]; /* MIDI message data */
+	unsigned mtickets;	/* max data to transmit (throttling) */
 
 	/*
 	 * fifo parameters
@@ -74,12 +81,14 @@ struct abuf {
 #define ABUF_WOK(b) ((b)->len - (b)->used >= (b)->bpf)
 
 /*
- * the buffer is empty and has no more writer
+ * the buffer is empty and has no writer anymore
  */
 #define ABUF_EOF(b) (!ABUF_ROK(b) && (b)->wproc == NULL)
 
 /*
- * the buffer is empty and has no more writer
+ * the buffer has no reader anymore, note that it's not
+ * enough the buffer to be disconnected, because it can
+ * be not yet connected buffer (eg. socket play buffer)
  */
 #define ABUF_HUP(b) (!ABUF_WOK(b) && (b)->rproc == NULL)