72bdb22a79
PR: 143019 Submitted by: Arjo Hooimeijer <hooimeijer@gmail.com> Approved by: maintainer timeout
90 lines
3.1 KiB
Text
90 lines
3.1 KiB
Text
--- doc/mpdconf.example.orig 2009-12-27 17:05:54.000000000 +0100
|
|
+++ doc/mpdconf.example 2010-01-17 00:14:50.000000000 +0100
|
|
@@ -10,14 +10,14 @@
|
|
# be disabled and audio files will only be accepted over ipc socket (using
|
|
# file:// protocol) or streaming files over an accepted protocol.
|
|
#
|
|
-#music_directory "~/music"
|
|
+music_directory "%%MPDDIR%%/music"
|
|
#
|
|
# This setting sets the MPD internal playlist directory. The purpose of this
|
|
# directory is storage for playlists created by MPD. The server will use
|
|
# playlist files not created by the server but only if they are in the MPD
|
|
# format. This setting defaults to playlist saving being disabled.
|
|
#
|
|
-#playlist_directory "~/.mpd/playlists"
|
|
+playlist_directory "%%MPDDIR%%/playlists"
|
|
#
|
|
# This setting sets the location of the MPD database. This file is used to
|
|
# load the database at server start up and store the database while the
|
|
@@ -25,7 +25,7 @@
|
|
# MPD to accept files over ipc socket (using file:// protocol) or streaming
|
|
# files over an accepted protocol.
|
|
#
|
|
-#db_file "~/.mpd/database"
|
|
+db_file "%%MPDDIR%%/database"
|
|
#
|
|
# These settings are the locations for the daemon log files for the daemon.
|
|
# These logs are great for troubleshooting, depending on your log_level
|
|
@@ -34,20 +34,21 @@
|
|
# The special value "syslog" makes MPD use the local syslog daemon. This
|
|
# setting defaults to logging to syslog, otherwise logging is disabled.
|
|
#
|
|
-#log_file "~/.mpd/log"
|
|
+log_file "%%MPDDIR%%/log"
|
|
+error_file "%%MPDDIR%%/error-log"
|
|
#
|
|
# This setting sets the location of the file which stores the process ID
|
|
# for use of mpd --kill and some init scripts. This setting is disabled by
|
|
# default and the pid file will not be stored.
|
|
#
|
|
-#pid_file "~/.mpd/pid"
|
|
+pid_file "%%MPDDIR%%/pid"
|
|
#
|
|
# This setting sets the location of the file which contains information about
|
|
# most variables to get MPD back into the same general shape it was in before
|
|
# it was brought down. This setting is disabled by default and the server
|
|
# state will be reset on server start up.
|
|
#
|
|
-#state_file "~/.mpd/state"
|
|
+state_file "%%MPDDIR%%/state"
|
|
#
|
|
###############################################################################
|
|
|
|
@@ -59,7 +60,7 @@
|
|
# initialization. This setting is disabled by default and MPD is run as the
|
|
# current user.
|
|
#
|
|
-#user "nobody"
|
|
+user "mpd"
|
|
#
|
|
# This setting sets the address for the daemon to listen on. Careful attention
|
|
# should be paid if this is assigned to anything other then the default, any.
|
|
@@ -69,7 +70,7 @@
|
|
#bind_to_address "any"
|
|
#
|
|
# And for Unix Socket
|
|
-#bind_to_address "~/.mpd/socket"
|
|
+#bind_to_address "%%MPDDIR%%/socket"
|
|
#
|
|
# This setting is the TCP port that is desired for the daemon to get assigned
|
|
# to.
|
|
@@ -172,18 +173,6 @@
|
|
# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of
|
|
# other audio outputs.
|
|
#
|
|
-# An example of an ALSA output:
|
|
-#
|
|
-#audio_output {
|
|
-# type "alsa"
|
|
-# name "My ALSA Device"
|
|
-## device "hw:0,0" # optional
|
|
-## format "44100:16:2" # optional
|
|
-## mixer_device "default" # optional
|
|
-## mixer_control "PCM" # optional
|
|
-## mixer_index "0" # optional
|
|
-#}
|
|
-#
|
|
# An example of an OSS output:
|
|
#
|
|
#audio_output {
|