X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/07bc035e2ec3e4fb109fb36ad5f1fd751a960e70..5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d:/examples/config.sample.in

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 324f230..4e6c629 100644
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -2,25 +2,6 @@
 #
 # You WILL need to edit this from the distributed version!
 
-# 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 execraw disorder-decode
-player *.flac execraw disorder-decode
-
-# Track length calculators
-#
-# If you add new formats then can add a plugin module to calculate the
-# length of a track.  See disorder(3) for the interface.
-tracklength *.mp3 disorder-tracklength
-tracklength *.ogg disorder-tracklength
-tracklength *.wav disorder-tracklength
-tracklength *.flac disorder-tracklength
-
 # Use the fs module to list files under /export/mp3.  The encoding
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
@@ -29,18 +10,10 @@ collection fs ISO-8859-1 /export/mp3
 scratch pkgdatadir/slap.ogg
 scratch pkgdatadir/scratch.ogg
 
-# Trust the web user and root.  Trusted users can stop the server or
-# pretend to be other users.
-#
-# This line can be removed after upgrade to 2.1 or later, or if the initial
-# install is of 2.1 or later.
-trust www-data root
+# This line just ensures that the pre-existing root user gets admin
+# rights and can be removed after upgrade to 3.0 or later, or if the
+# initial install is of 3.0 or later.
+trust root
 
 # Run as user jukebox.  This must exist in /etc/passwd!
 user jukebox
-
-# Volume control settings.
-# The device name to use
-mixer /dev/mixer
-# The channel to control
-channel pcm