Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2017-07-20 12:50:56 +02:00
commit 8c7d6cd46c
2 changed files with 2 additions and 6 deletions

View File

@ -179,7 +179,7 @@ then standard output will be used.
.It Fl p Ar position
Time offset where the beginning of the file belongs.
The first sample of the file will be played or recorded when the device
reaches the given postion.
reaches the given position.
The position is expressed as the number of samples (at device sample rate).
.It Fl q Ar port
Control audio device properties through this MIDI port.
@ -225,7 +225,7 @@ All audio files are controlled by the following MMC messages:
.Bl -tag -width relocate -offset indent
.It relocate
All files are relocated to the requested time position.
If it is beyond the end of a file, the file is temporarly
If it is beyond the end of a file, the file is temporarily
disabled until a valid position is requested.
.It start
Playback and/or recording is started.

View File

@ -450,10 +450,6 @@ and
constants; refer to
.Xr poll 2
for more details.
.Fn sio_pollfd
returns the number of
.Vt pollfd
structures filled.
The
.Fn sio_revents
function returns the bit-mask set by