X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e83d0967d4c0965eb8036248acc20d1bf12ad1d8..8dcb5ff035a5fac80ddacb56dccdfe93edcda05f:/doc/disorder_config.5.in diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in index 299233d..be922d2 100644 --- a/doc/disorder_config.5.in +++ b/doc/disorder_config.5.in @@ -142,24 +142,12 @@ automatically included, but should include the proper extension. .IP The default is \fB{/artist}{/album}{/title}{ext}\fR. .TP -.B backend \fINAME\fR -Selects the backend use by the speaker process. The following options are -available: -.RS +.B broadcast \fIADDRESS\fR \fIPORT\fR +Transmit sound data to \fIADDRESS\fR using UDP port \fIPORT\fR. This implies +\fBspeaker_backend network\fR. .TP -.B alsa -Use the ALSA API. This is only available on Linux systems, on which it is the -default. -.TP -.B command -Execute a command. This is the default if -.B speaker_command -is specified, or (currently) on non-Linux systems. -.TP -.B network -Transmit audio over the network. This is the default if -\fBbroadcast\fR is specified. -.RE +.B broadcast_from \fIADDRESS\fR \fIPORT\fR +Sets the (local) source address used by \fBbroadcast\fR. .TP .B channel \fICHANNEL\fR The mixer channel that the volume control should use. Valid names depend on @@ -346,6 +334,25 @@ scratched. The default is \fBSIGKILL\fR. Signals are specified by their full C name, i.e. \fBSIGINT\fR and not \fBINT\fR or \fBInterrupted\fR or whatever. .TP +.B speaker_backend \fINAME\fR +Selects the backend use by the speaker process. The following options are +available: +.RS +.TP +.B alsa +Use the ALSA API. This is only available on Linux systems, on which it is the +default. +.TP +.B command +Execute a command. This is the default if +.B speaker_command +is specified, or (currently) on non-Linux systems. +.TP +.B network +Transmit audio over the network. This is the default if +\fBbroadcast\fR is specified. +.RE +.TP .B sox_generation \fB0\fR|\fB1 Determines whether calls to \fBsox\fR(1) should use \fB-b\fR, \fB-x\fR, etc (if the generation is 0) or \fB-\fIbits\fR, \fB-L\fR etc (if it is 1). The default