diff options
| author | Aaron McEwan <chainsawbike@gmail.com> | 2008-10-12 12:14:51 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-12 12:14:51 +0200 |
| commit | 2139d8bba8620a194b980435a3093147f0de50cf (patch) | |
| tree | cf5a844450e57d33e4ad29ebcbcb85d8640a6636 /doc | |
| parent | ff69f122593f400f68db944505bf007d2938d912 (diff) | |
| download | mpd-2139d8bba8620a194b980435a3093147f0de50cf.tar.gz mpd-2139d8bba8620a194b980435a3093147f0de50cf.tar.xz mpd-2139d8bba8620a194b980435a3093147f0de50cf.zip | |
shout: make the protocol configurable
Added configuration parameter "protocol" which lets the user choose
from 3 shout protocols. This adds support for real shoutcast servers.
Diffstat (limited to '')
| -rw-r--r-- | doc/mpd.conf.5 | 6 | ||||
| -rw-r--r-- | doc/mpdconf.example | 1 |
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 |