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

encoder/Interface: move functions into the struct

Browse Source
This commit is contained in:
Max Kellermann
2015-01-08 19:36:19 +01:00
parent 362a6e6d46
commit ae4c189e19
6 changed files with 68 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ static void close_shout_conn(ShoutOutput * sd)
if (encoder_end(sd->encoder, IgnoreError()))
write_page(sd, IgnoreError());
encoder_close(sd->encoder);
sd->encoder->Close();
}
if (shout_get_connected(sd->shout_conn) != SHOUTERR_UNCONNECTED &&
@@ -362,7 +362,7 @@ my_shout_finish_driver(AudioOutput *ao)
{
ShoutOutput *sd = (ShoutOutput *)ao;
encoder_finish(sd->encoder);
sd->encoder->Dispose();
delete sd;
@@ -416,13 +416,13 @@ my_shout_open_device(AudioOutput *ao, AudioFormat &audio_format,
if (!shout_connect(sd, error))
return false;
if (!encoder_open(sd->encoder, audio_format, error)) {
if (!sd->encoder->Open(audio_format, error)) {
shout_close(sd->shout_conn);
return false;
}
if (!write_page(sd, error)) {
encoder_close(sd->encoder);
sd->encoder->Close();
shout_close(sd->shout_conn);
return false;
}