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

output/shout: call shout_shutdown() in destructor

Browse Source
This commit is contained in:
Max Kellermann 2016-05-04 15:03:55 +02:00
parent 492aaa3375
commit fb9840f1f8
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,12 +58,7 @@ struct ShoutOutput final {
shout_conn(shout_new()), shout_conn(shout_new()),
shout_meta(shout_metadata_new()) {} shout_meta(shout_metadata_new()) {}
~ShoutOutput() { ~ShoutOutput();
if (shout_meta != nullptr)
shout_metadata_free(shout_meta);
if (shout_conn != nullptr)
shout_free(shout_conn);
}
bool Initialize(const ConfigBlock &block, Error &error) { bool Initialize(const ConfigBlock &block, Error &error) {
return base.Configure(block, error); return base.Configure(block, error);
@ -76,6 +71,18 @@ static int shout_init_count;
static constexpr Domain shout_output_domain("shout_output"); static constexpr Domain shout_output_domain("shout_output");
ShoutOutput::~ShoutOutput()
{
if (shout_meta != nullptr)
shout_metadata_free(shout_meta);
if (shout_conn != nullptr)
shout_free(shout_conn);
shout_init_count--;
if (shout_init_count == 0)
shout_shutdown();
}
static const EncoderPlugin * static const EncoderPlugin *
shout_encoder_plugin_get(const char *name) shout_encoder_plugin_get(const char *name)
{ {
@ -271,6 +278,11 @@ ShoutOutput::Configure(const ConfigBlock &block, Error &error)
static AudioOutput * static AudioOutput *
my_shout_init_driver(const ConfigBlock &block, Error &error) my_shout_init_driver(const ConfigBlock &block, Error &error)
{ {
if (shout_init_count == 0)
shout_init();
shout_init_count++;
ShoutOutput *sd = new ShoutOutput(); ShoutOutput *sd = new ShoutOutput();
if (!sd->Initialize(block, error)) { if (!sd->Initialize(block, error)) {
delete sd; delete sd;
@ -282,11 +294,6 @@ my_shout_init_driver(const ConfigBlock &block, Error &error)
return nullptr; return nullptr;
} }
if (shout_init_count == 0)
shout_init();
shout_init_count++;
return &sd->base; return &sd->base;
} }
@ -362,11 +369,6 @@ my_shout_finish_driver(AudioOutput *ao)
sd->encoder->Dispose(); sd->encoder->Dispose();
delete sd; delete sd;
shout_init_count--;
if (shout_init_count == 0)
shout_shutdown();
} }
static void static void