Line 0
Link Here
|
|
|
1 |
|
2 |
$FreeBSD$ |
3 |
|
4 |
--- doc/mpdconf.example.orig |
5 |
+++ doc/mpdconf.example |
6 |
@@ -10,14 +10,14 @@ |
7 |
# be disabled and audio files will only be accepted over ipc socket (using |
8 |
# file:// protocol) or streaming files over an accepted protocol. |
9 |
# |
10 |
-#music_directory "~/music" |
11 |
+music_directory "%%MPDDIR%%/music" |
12 |
# |
13 |
# This setting sets the MPD internal playlist directory. The purpose of this |
14 |
# directory is storage for playlists created by MPD. The server will use |
15 |
# playlist files not created by the server but only if they are in the MPD |
16 |
# format. This setting defaults to playlist saving being disabled. |
17 |
# |
18 |
-#playlist_directory "~/.mpd/playlists" |
19 |
+playlist_directory "%%MPDDIR%%/playlists" |
20 |
# |
21 |
# This setting sets the location of the MPD database. This file is used to |
22 |
# load the database at server start up and store the database while the |
23 |
@@ -25,7 +25,7 @@ |
24 |
# MPD to accept files over ipc socket (using file:// protocol) or streaming |
25 |
# files over an accepted protocol. |
26 |
# |
27 |
-#db_file "~/.mpd/database" |
28 |
+db_file "%%MPDDIR%%/database" |
29 |
# |
30 |
# These settings are the locations for the daemon log files for the daemon. |
31 |
# These logs are great for troubleshooting, depending on your log_level |
32 |
@@ -34,20 +34,21 @@ |
33 |
# The special value "syslog" makes MPD use the local syslog daemon. This |
34 |
# setting defaults to logging to syslog, otherwise logging is disabled. |
35 |
# |
36 |
-#log_file "~/.mpd/log" |
37 |
+log_file "%%MPDDIR%%/log" |
38 |
+error_file "%%MPDDIR%%/error-log" |
39 |
# |
40 |
# This setting sets the location of the file which stores the process ID |
41 |
# for use of mpd --kill and some init scripts. This setting is disabled by |
42 |
# default and the pid file will not be stored. |
43 |
# |
44 |
-#pid_file "~/.mpd/pid" |
45 |
+pid_file "%%MPDDIR%%/pid" |
46 |
# |
47 |
# This setting sets the location of the file which contains information about |
48 |
# most variables to get MPD back into the same general shape it was in before |
49 |
# it was brought down. This setting is disabled by default and the server |
50 |
# state will be reset on server start up. |
51 |
# |
52 |
-#state_file "~/.mpd/state" |
53 |
+state_file "%%MPDDIR%%/state" |
54 |
# |
55 |
############################################################################### |
56 |
|
57 |
@@ -59,7 +60,7 @@ |
58 |
# initialization. This setting is disabled by default and MPD is run as the |
59 |
# current user. |
60 |
# |
61 |
-#user "nobody" |
62 |
+user "mpd" |
63 |
# |
64 |
# This setting sets the address for the daemon to listen on. Careful attention |
65 |
# should be paid if this is assigned to anything other then the default, any. |
66 |
@@ -69,7 +70,7 @@ |
67 |
#bind_to_address "any" |
68 |
# |
69 |
# And for Unix Socket |
70 |
-#bind_to_address "~/.mpd/socket" |
71 |
+#bind_to_address "%%MPDDIR%%/socket" |
72 |
# |
73 |
# This setting is the TCP port that is desired for the daemon to get assigned |
74 |
# to. |
75 |
@@ -172,18 +173,6 @@ |
76 |
# See <http://mpd.wikia.com/wiki/Configuration#Audio_Outputs> for examples of |
77 |
# other audio outputs. |
78 |
# |
79 |
-# An example of an ALSA output: |
80 |
-# |
81 |
-#audio_output { |
82 |
-# type "alsa" |
83 |
-# name "My ALSA Device" |
84 |
-# device "hw:0,0" # optional |
85 |
-# format "44100:16:2" # optional |
86 |
-# mixer_device "default" # optional |
87 |
-# mixer_control "PCM" # optional |
88 |
-# mixer_index "0" # optional |
89 |
-#} |
90 |
-# |
91 |
# An example of an OSS output: |
92 |
# |
93 |
#audio_output { |