X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/2eee4b0cd743865445a5023e8c10467cdc9b350e..983c335710951dd573e653b4da2a7a5d71b0aa9b:/doc/disorder_config.5.in diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in index ea3a4bf..d033258 100644 --- a/doc/disorder_config.5.in +++ b/doc/disorder_config.5.in @@ -1,20 +1,18 @@ .\" -.\" Copyright (C) 2004-2008 Richard Kettlewell +.\" Copyright (C) 2004-2009 Richard Kettlewell .\" -.\" This program is free software; you can redistribute it and/or modify +.\" This program is free software: you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 2 of the License, or +.\" the Free Software Foundation, either version 3 of the License, or .\" (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -.\" General Public License for more details. -.\" +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" .\" You should have received a copy of the GNU General Public License -.\" along with this program; if not, write to the Free Software -.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -.\" USA +.\" along with this program. If not, see . .\" .TH disorder_config 5 .SH NAME @@ -37,7 +35,7 @@ See \fBdisorder\fR(3) for more details about this. Each track can have a set of preferences associated with it. These are simple key-value pairs; they can be used for anything you like, but a number of keys have specific meanings. -See \fBdisorder\fR(1) for more details about these. +See \fBdisorder_preferences\fR(5) for more details about these. .SS "Track Names" Track names are derived from filenames under the control of regular expressions, rather than attempting to interpret format-specific embedded name @@ -50,6 +48,7 @@ the displayed track titles are not lexically sorted. .SS "Server State" A collection of global preferences define various bits of server state: whether random play is enabled, what tags to check for when picking at random, etc. +See \fBdisorder_preferences\fR(5) for more information. .SS "Users And Access Control" DisOrder distinguishes between multiple users. This is for access control and reporting, not to provide different @@ -277,12 +276,14 @@ This is the default if .B speaker_command is specified, or if no native is available. .TP -.B network +.B rtp Transmit audio over the network. This is the default if \fBbroadcast\fR is specified. You can use .BR disorder-playrtp (1) to receive and play the resulting stream on Linux and OS X. +.B network +is a deprecated synonym for this API. .RE .TP .B authorization_algorithm \fIALGORITHM\fR @@ -294,7 +295,7 @@ for more details. .TP .B broadcast \fIADDRESS\fR \fIPORT\fR Transmit sound data to \fIADDRESS\fR using UDP port \fIPORT\fR. -This implies \fBapi network\fR. +This implies \fBapi rtp\fR. .IP See also \fBmulticast_loop\fR and \fBmulticast_ttl\fR. .TP @@ -387,7 +388,12 @@ will be tried. .IP For \fBapi alsa\fR this is the device name to use. .IP -For \fBapi coreaudio\fR this is currently ignored. +For \fBapi coreaudio\fR this can be either the UID or the human-readable +name of the desired device. +For a list of names, visit System Preferences -> Sound and look at the Type column. +For example, you might use "Built-in Output" for the built-in speaker +or "Built-in Line Output" if you have connected external speakers. +Remember to quote the name. .IP The default is \fBdefault\fR, which is intended to map to whatever the system's default is. @@ -431,12 +437,12 @@ For \fBapi coreaudio\fR, volume setting is not currently supported. .B multicast_loop yes\fR|\fBno Determines whether multicast packets are loop backed to the sending host. The default is \fByes\fR. -This only applies if \fBapi\fR is set to \fBnetwork\fR and \fBbroadcast\fR +This only applies if \fBapi\fR is set to \fBrtp\fR and \fBbroadcast\fR is actually a multicast address. .TP .B multicast_ttl \fIHOPS\fR Set the maximum number of hops to send multicast packets. -This only applies if \fBapi\fR is set to \fBnetwork\fR and +This only applies if \fBapi\fR is set to \fBrtp\fR and \fBbroadcast\fR is actually a multicast address. The default is 1. .TP @@ -478,7 +484,7 @@ namepart ext "(\\.[a-zA-Z0-9]+)$" $1 * .TP .B new_bias \fIWEIGHT\fR The weight for new tracks. -The default is 900000, i.e. recently added tracks are a hundred times as likely +The default is 450000, i.e. recently added tracks are a fifty times as likely to be picked as normal. .TP .B new_bias_age \fISECONDS\fR @@ -624,7 +630,7 @@ The default is .BR 16/44100/2 . .PP With the -.B network +.B rtp backend the sample format is forced to .B 16b/44100/2 and with the @@ -647,7 +653,10 @@ Determines whether calls to \fBsox\fR(1) should use \fB\-b\fR, \fB\-x\fR, etc (i the generation is 0) or \fB\-\fIbits\fR, \fB\-L\fR etc (if it is 1). See the documentation for your installed copy of \fBsox\fR to determine which you need. -The default is 0. +The default is set according to the version of sox found when DisOrder was +built. +If you run on a system with a different version of sox, you will need to +set this option. .TP .B speaker_backend \fINAME This is an alias for \fBapi\fR; see above. @@ -712,7 +721,7 @@ Specify password. .TP .B username \fIUSERNAME\fR Specify username. -The default is taken from the environment variable \fBLOGNAME\fR. +The default is inferred from the current UID. .SS "Web Interface Configuration" .\" TODO this section is misnamed really... .TP @@ -780,34 +789,6 @@ longer needs to be specified. This must be the full URL, e.g. \fBhttp://myhost/cgi-bin/jukebox\fR and not \fB/cgi-bin/jukebox\fR. .SH "GLOBAL PREFERENCES" -These are the values set with \fBset\-global\fR. -.TP -.B required\-tags -If this is set an nonempty then randomly played tracks will always have at -least one of the listed tags. -.TP -.B prohibited\-tags -If this is set an nonempty then randomly played tracks will never have any of -the listed tags. -.TP -.B playing -If unset or \fByes\fR then play is enabled. -Otherwise it is disabled. -Use \fBdisable\fR rather than setting it directly. -.TP -.B random\-play -If unset or \fByes\fR then random play is enabled. -Otherwise it is disabled. -Use \fBdisable\fR rather than setting it directly. -.PP -Global preferences starting '_' are read-only (in the sense that you cannot -modify them; the server may modify them as part of its normal operation). -They are: -.TP -.B _dbversion -The database version string. -This is used by DisOrder to detect when it must -modify the database after an upgrade. .SH "LIBAO DRIVER" .SS "Raw Protocol Players" Raw protocol players are expected to use the \fBdisorder\fR libao driver. @@ -863,7 +844,7 @@ name and \fBext\fR which is the filename extension, including the initial dot .SH "SEE ALSO" \fBdisorder\fR(1), \fBsox\fR(1), \fBdisorderd\fR(8), \fBdisorder\-dump\fR(8), \fBpcrepattern\fR(3), \fBdisorder_templates\fR(5), \fBdisorder_actions\fR(5), -\fBdisorder.cgi\fR(8) +\fBdisorder.cgi\fR(8), \fBdisorder_preferences\fR(5) .\" Local Variables: .\" mode:nroff .\" fill-column:79