summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorratchov <ratchov@openbsd.org>2016-01-07 07:41:01 +0000
committerratchov <ratchov@openbsd.org>2016-01-07 07:41:01 +0000
commit3f2e611a0871d37142342c3ddd62c14157e1e5d4 (patch)
treebe06dc8d0481cc3aa1b8593a6532f2a8d03b7e16
parentrename the rx and tx ring softc vars. (diff)
downloadwireguard-openbsd-3f2e611a0871d37142342c3ddd62c14157e1e5d4.tar.xz
wireguard-openbsd-3f2e611a0871d37142342c3ddd62c14157e1e5d4.zip
Move sndiod man page to section 8.
suggested by deraadt, fixes from jmc, ok millert
-rw-r--r--lib/libsndio/mio_open.310
-rw-r--r--lib/libsndio/sio_open.312
-rw-r--r--lib/libsndio/sndio.746
-rw-r--r--usr.bin/aucat/aucat.110
-rw-r--r--usr.bin/sndiod/Makefile4
-rw-r--r--usr.bin/sndiod/sndiod.8 (renamed from usr.bin/sndiod/sndiod.1)6
6 files changed, 44 insertions, 44 deletions
diff --git a/lib/libsndio/mio_open.3 b/lib/libsndio/mio_open.3
index d8f44d02971..9850be16754 100644
--- a/lib/libsndio/mio_open.3
+++ b/lib/libsndio/mio_open.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mio_open.3,v 1.15 2015/09/14 15:14:55 schwarze Exp $
+.\" $OpenBSD: mio_open.3,v 1.16 2016/01/07 07:41:01 ratchov Exp $
.\"
.\" Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: January 7 2016 $
.Dt MIO_OPEN 3
.Os
.Sh NAME
@@ -51,7 +51,7 @@ The
library allows user processes to access
.Xr midi 4
hardware and
-.Xr sndiod 1
+.Xr sndiod 8
MIDI thru boxes and control ports in a uniform way.
.Ss Opening and closing an MIDI stream
First the application must call the
@@ -243,7 +243,7 @@ The debug level:
may be a value between 0 and 2.
.El
.Sh SEE ALSO
-.Xr sndiod 1 ,
.Xr poll 2 ,
.Xr midi 4 ,
-.Xr sndio 7
+.Xr sndio 7 ,
+.Xr sndiod 8
diff --git a/lib/libsndio/sio_open.3 b/lib/libsndio/sio_open.3
index 27b8ad23e7e..90b00102b0b 100644
--- a/lib/libsndio/sio_open.3
+++ b/lib/libsndio/sio_open.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sio_open.3,v 1.43 2015/09/14 15:14:55 schwarze Exp $
+.\" $OpenBSD: sio_open.3,v 1.44 2016/01/07 07:41:01 ratchov Exp $
.\"
.\" Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: January 7 2016 $
.Dt SIO_OPEN 3
.Os
.Sh NAME
@@ -80,7 +80,7 @@ The
library allows user processes to access
.Xr audio 4
hardware and the
-.Xr sndiod 1
+.Xr sndiod 8
audio server in a uniform way.
.Ss Opening and closing an audio device
First the application must call the
@@ -255,7 +255,7 @@ has been called,
must be called before parameters can be changed.
.Pp
If the device is exposed by the
-.Xr sndiod 1
+.Xr sndiod 8
server, which is the default configuration,
a transparent emulation layer will
automatically be set up, and in this case any combination of
@@ -709,9 +709,9 @@ The debug level:
may be a value between 0 and 2.
.El
.Sh SEE ALSO
-.Xr sndiod 1 ,
.Xr audio 4 ,
.Xr sndio 7 ,
+.Xr sndiod 8 ,
.Xr audio 9
.Sh BUGS
The
@@ -727,7 +727,7 @@ function will stop playback immediately.
If the application doesn't consume recorded data fast enough then
.Dq "control messages"
from the
-.Xr sndiod 1
+.Xr sndiod 8
server are delayed and consequently
.Fn sio_onmove
callback or volume changes may be delayed.
diff --git a/lib/libsndio/sndio.7 b/lib/libsndio/sndio.7
index aeca1afbb70..7332ce381c4 100644
--- a/lib/libsndio/sndio.7
+++ b/lib/libsndio/sndio.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sndio.7,v 1.16 2015/11/25 17:22:36 ratchov Exp $
+.\" $OpenBSD: sndio.7,v 1.17 2016/01/07 07:41:01 ratchov Exp $
.\"
.\" Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 25 2015 $
+.Dd $Mdocdate: January 7 2016 $
.Dt SNDIO 7
.Os
.Sh NAME
@@ -25,7 +25,7 @@ The
.Nm sndio
audio and MIDI system provides access to audio and MIDI hardware and
to services provided by
-.Xr sndiod 1 ,
+.Xr sndiod 8 ,
summarized below.
.Pp
Hardware
@@ -38,7 +38,7 @@ audio programs.
.Pp
To overcome hardware limitations and to allow multiple applications
to share the hardware,
-.Xr sndiod 1
+.Xr sndiod 8
can be used.
It exposes one or more software sub-devices backed by the underlying hardware,
while doing all necessary conversions on the fly.
@@ -57,15 +57,15 @@ Software MIDI thru boxes allow one application to send MIDI data to other
applications connected to the thru box (for instance a software sequencer
can send events to multiple software synthesizers).
There's no hardware involved: thru boxes are created by
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.Pp
Additionally,
-.Xr sndiod 1
+.Xr sndiod 8
exposes a MIDI port used to control and monitor audio streams
in real time using MIDI.
.Sh DEVICE NAMES
From the user's perspective every audio interface, MIDI port, and
-.Xr sndiod 1
+.Xr sndiod 8
service has a name of the form:
.Bd -literal -offset center
type[@hostname][,unit]/devnum[.option]
@@ -89,36 +89,36 @@ Raw
port.
.It Pa snd
Audio device exposed by
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.It Pa midithru
MIDI thru box created with
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.It Pa midi
MIDI port exposed by
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.It Pa default
Default audio device or MIDI port (see below).
.El
.It Pa hostname
The hostname or address where the remote
-.Xr sndiod 1
+.Xr sndiod 8
server to connect to is running.
.It Pa unit
The number of the
-.Xr sndiod 1
+.Xr sndiod 8
server to connect to, corresponding to the integer specified using the
.Fl U
option of
-.Xr sndiod 1 .
+.Xr sndiod 8 .
Useful only if multiple
-.Xr sndiod 1
+.Xr sndiod 8
servers are running on the same system.
.It Pa devnum
Device number.
For hardware audio or MIDI ports, this corresponds to
the character device minor number.
For audio devices or MIDI ports created with
-.Xr sndiod 1
+.Xr sndiod 8
it corresponds to the number of the corresponding
.Fl fq
option on the command line.
@@ -126,7 +126,7 @@ option on the command line.
Corresponds to the sub-device string registered using the
.Fl s
option of
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.El
.Pp
For example:
@@ -138,13 +138,13 @@ First hardware audio device.
Hardware MIDI port number 5.
.It Pa snd/0
First audio device exposed by
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.It Pa snd/0.rear
Sub-device registered with
.Fl s Fa rear .
.It Pa midithru/0
First MIDI thru box created with
-.Xr sndiod 1 .
+.Xr sndiod 8 .
.El
.Sh DEFAULTS
If
@@ -158,10 +158,10 @@ If it is not set, the program first tries to connect to
If that fails, it then tries to use
.Pa rsnd/0 .
This allows the
-.Xr sndiod 1
+.Xr sndiod 8
audio server to be used by default and the bare hardware as fallback;
programs don't have to be reconfigured when
-.Xr sndiod 1
+.Xr sndiod 8
is started or stopped.
.Pp
If
@@ -175,14 +175,14 @@ If it is not set, the program first tries to connect to
If that fails, it then tries to use
.Pa rmidi/0 .
As long as
-.Xr sndiod 1
+.Xr sndiod 8
is running, this allows programs to exchange MIDI data on
machines with no MIDI hardware by default, e.g. a MIDI player
could use a software synthesizer with no manual configuration
required.
.Sh AUTHENTICATION
If a shared
-.Xr sndiod 1
+.Xr sndiod 8
server is running, for privacy reasons only one user may have
connections to it at a given time
(though the same user could have multiple connections to it).
@@ -216,7 +216,7 @@ Audio devices.
MIDI ports.
.El
.Sh SEE ALSO
-.Xr sndiod 1 ,
+.Xr sndiod 8 ,
.Xr mio_open 3 ,
.Xr sio_open 3 ,
.Xr audio 4 ,
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index 132dac06915..7d8fae1ba90 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aucat.1,v 1.111 2015/12/25 20:52:00 bentley Exp $
+.\" $OpenBSD: aucat.1,v 1.112 2016/01/07 07:41:01 ratchov Exp $
.\"
.\" Copyright (c) 2006 Alexandre Ratchov <alex@caoua.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: December 25 2015 $
+.Dd $Mdocdate: January 7 2016 $
.Dt AUCAT 1
.Os
.Sh NAME
@@ -223,7 +223,7 @@ back to the starting position.
.El
.Pp
MIDI control is intended to be used together with
-.Xr sndiod 1 .
+.Xr sndiod 8 .
For instance, the following command will create two devices:
the default
.Va snd/0
@@ -280,9 +280,9 @@ $ aucat -n -i stereo.wav -c 0:0 -o left.wav \e
.Xr audioctl 1 ,
.Xr cdio 1 ,
.Xr mixerctl 1 ,
-.Xr sndiod 1 ,
.Xr audio 4 ,
-.Xr sndio 7
+.Xr sndio 7 ,
+.Xr sndiod 8
.Sh BUGS
Resampling is low quality.
.Pp
diff --git a/usr.bin/sndiod/Makefile b/usr.bin/sndiod/Makefile
index 826c9d9571d..2bfe3936c24 100644
--- a/usr.bin/sndiod/Makefile
+++ b/usr.bin/sndiod/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2015/12/20 11:38:33 ratchov Exp $
+# $OpenBSD: Makefile,v 1.5 2016/01/07 07:41:01 ratchov Exp $
PROG= sndiod
SRCS= abuf.c dev.c dsp.c fdpass.c file.c listen.c midi.c miofile.c \
opt.c siofile.c sndiod.c sock.c utils.c
-MAN= sndiod.1
+MAN= sndiod.8
CFLAGS+=-DDEBUG -I${.CURDIR}/../../lib/libsndio
COPTS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wundef
LDADD+= -lsndio
diff --git a/usr.bin/sndiod/sndiod.1 b/usr.bin/sndiod/sndiod.8
index abc8c4edd09..35b681bb32f 100644
--- a/usr.bin/sndiod/sndiod.1
+++ b/usr.bin/sndiod/sndiod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sndiod.1,v 1.10 2015/12/25 20:52:00 bentley Exp $
+.\" $OpenBSD: sndiod.8,v 1.1 2016/01/07 07:41:01 ratchov Exp $
.\"
.\" Copyright (c) 2006-2012 Alexandre Ratchov <alex@caoua.org>
.\"
@@ -14,8 +14,8 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: December 25 2015 $
-.Dt SNDIOD 1
+.Dd $Mdocdate: January 7 2016 $
+.Dt SNDIOD 8
.Os
.Sh NAME
.Nm sndiod