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

output/shout: dispose encoder in destructor

Browse Source
This commit is contained in:
Max Kellermann 2016-05-04 15:05:48 +02:00
parent fb9840f1f8
commit 73cadd1798
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ struct ShoutOutput final {
shout_t *shout_conn; shout_t *shout_conn;
shout_metadata_t *shout_meta; shout_metadata_t *shout_meta;
Encoder *encoder; Encoder *encoder = nullptr;
float quality = -2.0; float quality = -2.0;
int bitrate = -1; int bitrate = -1;
@ -81,6 +81,9 @@ ShoutOutput::~ShoutOutput()
shout_init_count--; shout_init_count--;
if (shout_init_count == 0) if (shout_init_count == 0)
shout_shutdown(); shout_shutdown();
if (encoder != nullptr)
encoder->Dispose();
} }
static const EncoderPlugin * static const EncoderPlugin *
@ -365,9 +368,6 @@ static void
my_shout_finish_driver(AudioOutput *ao) my_shout_finish_driver(AudioOutput *ao)
{ {
ShoutOutput *sd = (ShoutOutput *)ao; ShoutOutput *sd = (ShoutOutput *)ao;
sd->encoder->Dispose();
delete sd; delete sd;
} }