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

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 0f197e2..4e6c629 100644
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -1,58 +1,19 @@
-# player programs
-# see README.raw for details of the 'disorder' libao plugin
-player *.mp3 execraw mpg321 -q -o disorder
-player *.ogg execraw ogg123 -q -d disorder -o fragile:1
-player *.wav shell --wait-for-device play
+# Sample DisOrder config file
+#
+# You WILL need to edit this from the distributed version!
 
-# use the fs module to list files under /export/mp3.  The encoding
+# Use the fs module to list files under /export/mp3.  The encoding
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
 
-# don't leave a gap between tracks
-gap 0
-
-# scratch tracks
+# Scratch tracks.  You can add your own tracks here.
 scratch pkgdatadir/slap.ogg
-scratch pkgdatadir/scratch.mp3
+scratch pkgdatadir/scratch.ogg
 
-# trust the web user and root
-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
+# Run as user jukebox.  This must exist in /etc/passwd!
 user jukebox
-
-# volume control
-mixer /dev/mixer
-channel pcm
-
-# URL of the web interface
-url http://jukebox.anjou.terraraq.org.uk/
-
-# 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