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

output/shout: use the shout_metadata_t only once

Browse Source 
There is no documentation on whether calling shout_metadata_add()
multiple times on one instance is allowed.  To be sure, let's allocate
the object on demand each time in SendTag().
This commit is contained in:
Max Kellermann 2017-11-10 22:30:53 +01:00
parent 4c824e5309
commit 20199e770c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "encoder/Configured.hxx" #include "encoder/Configured.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ScopeExit.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include "Log.hxx" #include "Log.hxx"
@ -41,7 +42,6 @@ static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2;
struct ShoutOutput final : AudioOutput { struct ShoutOutput final : AudioOutput {
shout_t *shout_conn; shout_t *shout_conn;
shout_metadata_t *shout_meta;
std::unique_ptr<PreparedEncoder> prepared_encoder; std::unique_ptr<PreparedEncoder> prepared_encoder;
Encoder *encoder; Encoder *encoder;
@ -99,7 +99,6 @@ ShoutSetAudioInfo(shout_t *shout_conn, const AudioFormat &audio_format)
ShoutOutput::ShoutOutput(const ConfigBlock &block) ShoutOutput::ShoutOutput(const ConfigBlock &block)
:AudioOutput(FLAG_PAUSE), :AudioOutput(FLAG_PAUSE),
shout_conn(shout_new()), shout_conn(shout_new()),
shout_meta(shout_metadata_new()),
prepared_encoder(CreateConfiguredEncoder(block, true)) prepared_encoder(CreateConfiguredEncoder(block, true))
{ {
NeedFullyDefinedAudioFormat(); NeedFullyDefinedAudioFormat();
@ -185,8 +184,6 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
ShoutOutput::~ShoutOutput() ShoutOutput::~ShoutOutput()
{ {
if (shout_meta != nullptr)
shout_metadata_free(shout_meta);
if (shout_conn != nullptr) if (shout_conn != nullptr)
shout_free(shout_conn); shout_free(shout_conn);
@ -358,12 +355,15 @@ ShoutOutput::SendTag(const Tag &tag)
encoder->SendTag(tag); encoder->SendTag(tag);
} else { } else {
/* no stream tag support: fall back to icy-metadata */ /* no stream tag support: fall back to icy-metadata */
const auto meta = shout_metadata_new();
AtScopeExit(meta) { shout_metadata_free(meta); };
char song[1024]; char song[1024];
shout_tag_to_metadata(tag, song, sizeof(song)); shout_tag_to_metadata(tag, song, sizeof(song));
shout_metadata_add(shout_meta, "song", song); shout_metadata_add(meta, "song", song);
if (SHOUTERR_SUCCESS != shout_set_metadata(shout_conn, if (SHOUTERR_SUCCESS != shout_set_metadata(shout_conn, meta)) {
shout_meta)) {
LogWarning(shout_output_domain, LogWarning(shout_output_domain,
"error setting shout metadata"); "error setting shout metadata");
} }