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

output/Shout: pass shout_t* to handle_shout_error()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-08 18:44:31 +02:00
parent d22361f7c7
commit 6ab19c7ef2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,7 +257,7 @@ ShoutOutput::Create(EventLoop &, const ConfigBlock &block)
} }
static void static void
handle_shout_error(ShoutOutput *sd, int err) HandleShoutError(shout_t *shout_conn, int err)
{ {
switch (err) { switch (err) {
case SHOUTERR_SUCCESS: case SHOUTERR_SUCCESS:
@@ -266,15 +266,15 @@ handle_shout_error(ShoutOutput *sd, int err)
case SHOUTERR_UNCONNECTED: case SHOUTERR_UNCONNECTED:
case SHOUTERR_SOCKET: case SHOUTERR_SOCKET:
throw FormatRuntimeError("Lost shout connection to %s:%i: %s", throw FormatRuntimeError("Lost shout connection to %s:%i: %s",
shout_get_host(sd->shout_conn), shout_get_host(shout_conn),
shout_get_port(sd->shout_conn), shout_get_port(shout_conn),
shout_get_error(sd->shout_conn)); shout_get_error(shout_conn));
default: default:
throw FormatRuntimeError("connection to %s:%i error: %s", throw FormatRuntimeError("connection to %s:%i error: %s",
shout_get_host(sd->shout_conn), shout_get_host(shout_conn),
shout_get_port(sd->shout_conn), shout_get_port(shout_conn),
shout_get_error(sd->shout_conn)); shout_get_error(shout_conn));
} }
} }
@@ -290,7 +290,7 @@ write_page(ShoutOutput *sd)
return true; return true;
int err = shout_send(sd->shout_conn, sd->buffer, nbytes); int err = shout_send(sd->shout_conn, sd->buffer, nbytes);
handle_shout_error(sd, err); HandleShoutError(sd->shout_conn, err);
} }
return true; return true;