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

output/shout: evaluate `tls` option only if TLS is enabled in libshout 

Fixes build failure after commit
0cea67ee70
This commit is contained in:
Max Kellermann 2019-01-21 14:36:43 +01:00
parent 037bb07d08
commit 754f4048a8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,7 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
protocol = SHOUT_PROTOCOL_HTTP; protocol = SHOUT_PROTOCOL_HTTP;
} }
#ifdef SHOUT_TLS
unsigned tls; unsigned tls;
value = block.GetBlockValue("tls"); value = block.GetBlockValue("tls");
if (value != nullptr) { if (value != nullptr) {
@ -159,6 +160,7 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
} else { } else {
tls = SHOUT_TLS_DISABLED; tls = SHOUT_TLS_DISABLED;
} }
#endif
if (shout_set_host(shout_conn, host) != SHOUTERR_SUCCESS || if (shout_set_host(shout_conn, host) != SHOUTERR_SUCCESS ||
shout_set_port(shout_conn, port) != SHOUTERR_SUCCESS || shout_set_port(shout_conn, port) != SHOUTERR_SUCCESS ||
@ -170,7 +172,9 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
shout_set_format(shout_conn, shout_format) shout_set_format(shout_conn, shout_format)
!= SHOUTERR_SUCCESS || != SHOUTERR_SUCCESS ||
shout_set_protocol(shout_conn, protocol) != SHOUTERR_SUCCESS || shout_set_protocol(shout_conn, protocol) != SHOUTERR_SUCCESS ||
#ifdef SHOUT_TLS
shout_set_tls(shout_conn, tls) != SHOUTERR_SUCCESS || shout_set_tls(shout_conn, tls) != SHOUTERR_SUCCESS ||
#endif
shout_set_agent(shout_conn, "MPD") != SHOUTERR_SUCCESS) shout_set_agent(shout_conn, "MPD") != SHOUTERR_SUCCESS)
throw std::runtime_error(shout_get_error(shout_conn)); throw std::runtime_error(shout_get_error(shout_conn));