oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/shout: rename "encoding" to "encoder"

Browse Source 
The user manual specifies "encoder", which is consistent with other
output plugins.  "encoding" should be deprecated.
This commit is contained in:
Max Kellermann 2016-07-29 10:52:03 +02:00
parent 77c6e45e65
commit 83aed7051c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -3,6 +3,8 @@ ver 0.19.18 (not yet released)
- ffmpeg: fix crash with older FFmpeg versions (< 3.0) - ffmpeg: fix crash with older FFmpeg versions (< 3.0)
- ffmpeg: log detailed error message - ffmpeg: log detailed error message
- ffmpeg: support FFmpeg 3.1 - ffmpeg: support FFmpeg 3.1
* output
- shout: recognize setting "encoder" instead of "encoding"
* require gcc 4.7 or newer * require gcc 4.7 or newer
ver 0.19.17 (2016/07/09) ver 0.19.17 (2016/07/09)

2
doc/mpdconf.example
View File

@ -231,7 +231,7 @@ input {
# #
#audio_output { #audio_output {
# type "shout" # type "shout"
# encoding "ogg" # optional # encoder "vorbis" # optional
# name "My Shout Stream" # name "My Shout Stream"
# host "localhost" # host "localhost"
# port "8000" # port "8000"

4
src/output/plugins/ShoutOutputPlugin.cxx
View File

@ -164,7 +164,9 @@ ShoutOutput::Configure(const config_param &param, Error &error)
} }
} }
const char *encoding = param.GetBlockValue("encoding", "ogg"); const char *encoding = param.GetBlockValue("encoder", nullptr);
if (encoding == nullptr)
encoding = param.GetBlockValue("encoding", "vorbis");
const auto encoder_plugin = shout_encoder_plugin_get(encoding); const auto encoder_plugin = shout_encoder_plugin_get(encoding);
if (encoder_plugin == nullptr) { if (encoder_plugin == nullptr) {
error.Format(config_domain, error.Format(config_domain,