aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/mpd.conf.56
-rw-r--r--doc/mpdconf.example1
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 5a77d4944..9263b0865 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -382,8 +382,12 @@ for encoding.
.TP
.B encoding <encoding>
This specifies which output encoding to use. Should be either "ogg"
-or "mp3". The default is "ogg".
+or "mp3", "mp3" is needed for shoutcast streaming. The default is "ogg".
.TP
+.B protocol <protocol>
+This specifies the protocol that wil be used to connect to the
+icecast/shoutcast server. The options are "shoutcast", "icecast1" and
+"icecast2". The default is "icecast2".
.B user <username>
This specifies the username to use when logging in to the icecast server. The
default is "source".
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 995bba3aa..a3dd6048f 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -121,6 +121,7 @@ error_file "~/.mpd/mpd.error"
# quality "5.0"
# bitrate "128"
# format "44100:16:1"
+# protocol "icecast2"
# user "source" # optional
# description "My Stream Description" # optional
# genre "jazz" # optional