From 1cfea20b22c6828b3ade202ec5298ba536ea5c9e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 14 Oct 2021 12:03:50 +0200 Subject: [PATCH] output/shout: remove the defunct "timeout" option The implementation was removed 12 years ago in commit f6455d5f79fe and nobody missed it. --- doc/plugins.rst | 2 -- src/output/plugins/ShoutOutputPlugin.cxx | 5 ----- 2 files changed, 7 deletions(-) diff --git a/doc/plugins.rst b/doc/plugins.rst index 40d629bbe..382426dbc 100644 --- a/doc/plugins.rst +++ b/doc/plugins.rst @@ -1143,8 +1143,6 @@ You must set a format. - Sets the host name of the `ShoutCast `_ / `IceCast `_ server. * - **port PORTNUMBER** - Connect to this port number on the specified host. - * - **timeout SECONDS** - - Set the timeout for the shout connection in seconds. Defaults to 2 seconds. * - **protocol icecast2|icecast1|shoutcast** - Specifies the protocol that wil be used to connect to the server. The default is "icecast2". * - **tls disabled|auto|auto_no_plain|rfc2818|rfc2817** diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx index 83402083e..281fcef6f 100644 --- a/src/output/plugins/ShoutOutputPlugin.cxx +++ b/src/output/plugins/ShoutOutputPlugin.cxx @@ -36,16 +36,12 @@ #include -static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2; - struct ShoutOutput final : AudioOutput { shout_t *shout_conn; std::unique_ptr prepared_encoder; Encoder *encoder; - int timeout = DEFAULT_CONN_TIMEOUT; - uint8_t buffer[32768]; explicit ShoutOutput(const ConfigBlock &block); @@ -180,7 +176,6 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block) throw std::runtime_error(shout_get_error(shout_conn)); /* optional paramters */ - timeout = block.GetBlockValue("timeout", DEFAULT_CONN_TIMEOUT); value = block.GetBlockValue("genre"); if (value != nullptr && shout_set_genre(shout_conn, value))