Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
1cfea20b
Commit
1cfea20b
authored
Oct 14, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/shout: remove the defunct "timeout" option
The implementation was removed 12 years ago in commit
f6455d5f
and nobody missed it.
parent
efa3ffa8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
plugins.rst
doc/plugins.rst
+0
-2
ShoutOutputPlugin.cxx
src/output/plugins/ShoutOutputPlugin.cxx
+0
-5
No files found.
doc/plugins.rst
View file @
1cfea20b
...
...
@@ -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.
* - **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**
...
...
src/output/plugins/ShoutOutputPlugin.cxx
View file @
1cfea20b
...
...
@@ -36,16 +36,12 @@
#include <stdio.h>
static
constexpr
unsigned
DEFAULT_CONN_TIMEOUT
=
2
;
struct
ShoutOutput
final
:
AudioOutput
{
shout_t
*
shout_conn
;
std
::
unique_ptr
<
PreparedEncoder
>
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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment