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

Merge branch 'v0.19.x'

Browse Source
This commit is contained in:
Max Kellermann
2016-07-29 20:23:45 +02:00
parent 32afd92d30 762f3afb9d
commit 2777a23672
9 changed files with 349 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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