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

output/Shout: pass shout_t* to shout_connect()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-08 18:52:03 +02:00
parent 8134b0073b
commit f46d545307
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,25 +330,25 @@ ShoutOutput::Cancel()
} }
static void static void
shout_connect(ShoutOutput *sd) ShoutOpen(shout_t *shout_conn)
{ {
switch (shout_open(sd->shout_conn)) { switch (shout_open(shout_conn)) {
case SHOUTERR_SUCCESS: case SHOUTERR_SUCCESS:
case SHOUTERR_CONNECTED: case SHOUTERR_CONNECTED:
break; break;
default: default:
throw FormatRuntimeError("problem opening connection to shout server %s:%i: %s", throw FormatRuntimeError("problem opening connection to shout server %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));
} }
} }
void void
ShoutOutput::Open(AudioFormat &audio_format) ShoutOutput::Open(AudioFormat &audio_format)
{ {
shout_connect(this); ShoutOpen(shout_conn);
try { try {
encoder = prepared_encoder->Open(audio_format); encoder = prepared_encoder->Open(audio_format);