From 83aed7051cf54b94036f388183ffd0c935e1df79 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 29 Jul 2016 10:52:03 +0200 Subject: [PATCH] output/shout: rename "encoding" to "encoder" The user manual specifies "encoder", which is consistent with other output plugins. "encoding" should be deprecated. --- NEWS | 2 ++ doc/mpdconf.example | 2 +- src/output/plugins/ShoutOutputPlugin.cxx | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 02f873c17..827903a33 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ ver 0.19.18 (not yet released) - ffmpeg: fix crash with older FFmpeg versions (< 3.0) - ffmpeg: log detailed error message - ffmpeg: support FFmpeg 3.1 +* output + - shout: recognize setting "encoder" instead of "encoding" * require gcc 4.7 or newer ver 0.19.17 (2016/07/09) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 6ba0351e8..21d4b4165 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -231,7 +231,7 @@ input { # #audio_output { # type "shout" -# encoding "ogg" # optional +# encoder "vorbis" # optional # name "My Shout Stream" # host "localhost" # port "8000" diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx index 406be8daf..b0456f520 100644 --- a/src/output/plugins/ShoutOutputPlugin.cxx +++ b/src/output/plugins/ShoutOutputPlugin.cxx @@ -164,7 +164,9 @@ ShoutOutput::Configure(const config_param ¶m, 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); if (encoder_plugin == nullptr) { error.Format(config_domain,