X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b864f34d39238ef1e47dd7f4784f4bba34f145e7..249ab79fe16c4dff89b2738648764a1b8ca3a22f:/debian/etc.disorder.config

diff --git a/debian/etc.disorder.config b/debian/etc.disorder.config
index e1eec1d..7c89a8f 100644
--- a/debian/etc.disorder.config
+++ b/debian/etc.disorder.config
@@ -1,49 +1,46 @@
-# player programs
+# Debian DisOrder config file
+#
+# You can use 'dpkg-reconfigure disorder' to adjust the following items:
+#  - track collections
+#  - scratch tracks
+#  - the hostname to use in the web interface
+#  - the port number for the server to use
+#
+# For anything else, you will need to edit this file.
+#
+
+# Player programs
+#
+# You can add new players for other formats.  For gapless and network
+# play to work, you will need a player that can use libao and DisOrder's
+# special driver - see "LIBAO driver" in disorder_config(5)
 player *.mp3 execraw disorder-decode
 player *.ogg execraw disorder-decode
-player *.wav shell play
+player *.wav execraw disorder-decode
+player *.flac execraw disorder-decode
 
-# don't leave a gap between tracks
+# Don't leave a gap between tracks.
 gap 0
 
-# trust the web user and root
+# Trust the web user and root.  Trusted users can stop the server or
+# pretend to be other users.
 trust www-data root
 
-# run as user jukebox
+# Run as user jukebox.
 user jukebox
 
-# volume control
+# Volume control settings.
+# The device name to use
 mixer /dev/mixer
+# The channel to control
 channel pcm
 
-# stopwords (i.e. ignored words) for the track search facility
+# Stopwords (i.e. ignored words) for the track search facility.
 stopword 01 02 03 04 05 06 07 08 09 10
 stopword 1 2 3 4 5 6 7 8 9
 stopword 11 12 13 14 15 16 17 18 19 20
 stopword 21 22 23 24 25 26 27 28 29 30
 stopword the a an and to too in on of we i am as im for is
 
-# namepart and transform are now filled in by default if you do not supply
-# them.  However if you supply any namepart directives then you will not
-# get any defaults at all, so you must supply the full set.  Similarly,
-# if you supply any transform directives then you must supply the full set.
-
-# Parsing of track names for the currently playing track, the recently
-# played list and the queue.
-#namepart  title   "/([0-9]+:)?([^/]+)\\.[a-zA-Z0-9]+$"     "$2"      display
-#namepart  title   "/([^/]+)\\.[a-zA-Z0-9]+$"               "$1"      sort
-#namepart  album   "/([^/]+)/[^/]+$"                        "$1"      *
-#namepart  artist  "/([^/]+)/[^/]+/[^/]+$"                  "$1"      *
-# used in alias construction
-#namepart  ext     "(\\.[a-zA-Z0-9]+)$"                     "$1"      *
-
-# Transformations of directory and filenames for the track choice screen
-#transform track   "^.*/([0-9]+:)?([^/]+)\\.[a-zA-Z0-9]+$"  "$2"      display
-#transform track   "^.*/([^/]+)\\.[a-zA-Z0-9]+$"            "$1"      sort
-
-#transform dir     "^.*/([^/]+)$"                           "$1"      *
-#transform dir     "^(the) ([^/]*)"                         "$2, $1"  sort    i
-#transform dir     "[[:punct:]]"                            ""        sort    g
-
 # include debconf configuration
 include /etc/disorder/conf.debconf