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

output/shout: remove the defunct "timeout" option 

The implementation was removed 12 years ago in commit f6455d5f79 and
nobody missed it.
This commit is contained in:
Max Kellermann 2021-10-14 12:03:50 +02:00
parent efa3ffa8d8
commit 1cfea20b22
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/plugins.rst
View File

@ -1143,8 +1143,6 @@ You must set a format.
- Sets the host name of the `ShoutCast <http://www.shoutcast.com/>`_ / `IceCast <http://icecast.org/>`_ server. - Sets the host name of the `ShoutCast <http://www.shoutcast.com/>`_ / `IceCast <http://icecast.org/>`_ server.
* - **port PORTNUMBER** * - **port PORTNUMBER**
- Connect to this port number on the specified host. - 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** * - **protocol icecast2|icecast1|shoutcast**
- Specifies the protocol that wil be used to connect to the server. The default is "icecast2". - Specifies the protocol that wil be used to connect to the server. The default is "icecast2".
* - **tls disabled|auto|auto_no_plain|rfc2818|rfc2817** * - **tls disabled|auto|auto_no_plain|rfc2818|rfc2817**

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

@ -36,16 +36,12 @@
#include <stdio.h> #include <stdio.h>
static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2;
struct ShoutOutput final : AudioOutput { struct ShoutOutput final : AudioOutput {
shout_t *shout_conn; shout_t *shout_conn;
std::unique_ptr<PreparedEncoder> prepared_encoder; std::unique_ptr<PreparedEncoder> prepared_encoder;
Encoder *encoder; Encoder *encoder;
int timeout = DEFAULT_CONN_TIMEOUT;
uint8_t buffer[32768]; uint8_t buffer[32768];
explicit ShoutOutput(const ConfigBlock &block); explicit ShoutOutput(const ConfigBlock &block);
@ -180,7 +176,6 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
throw std::runtime_error(shout_get_error(shout_conn)); throw std::runtime_error(shout_get_error(shout_conn));
/* optional paramters */ /* optional paramters */
timeout = block.GetBlockValue("timeout", DEFAULT_CONN_TIMEOUT);
value = block.GetBlockValue("genre"); value = block.GetBlockValue("genre");
if (value != nullptr && shout_set_genre(shout_conn, value)) if (value != nullptr && shout_set_genre(shout_conn, value))