aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/FlacCommon.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-31 00:26:55 +0200
committerMax Kellermann <max@duempel.org>2013-07-31 00:35:05 +0200
commit7f9402bd22f02a46b32d53560094622493f33f37 (patch)
treeb96b437520be32a512943985035939b9b94e5223 /src/decoder/FlacCommon.cxx
parentcbd38327e7f6948647768227ac4836f64e5ccd51 (diff)
downloadmpd-7f9402bd22f02a46b32d53560094622493f33f37.tar.gz
mpd-7f9402bd22f02a46b32d53560094622493f33f37.tar.xz
mpd-7f9402bd22f02a46b32d53560094622493f33f37.zip
Tag: add method Clear()
Allow reusing Tag instances.
Diffstat (limited to 'src/decoder/FlacCommon.cxx')
-rw-r--r--src/decoder/FlacCommon.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/decoder/FlacCommon.cxx b/src/decoder/FlacCommon.cxx
index 6b6c20d3c..32917ed86 100644
--- a/src/decoder/FlacCommon.cxx
+++ b/src/decoder/FlacCommon.cxx
@@ -36,16 +36,10 @@ flac_data::flac_data(struct decoder *_decoder,
:FlacInput(_input_stream, _decoder),
initialized(false), unsupported(false),
total_frames(0), first_frame(0), next_frame(0), position(0),
- decoder(_decoder), input_stream(_input_stream),
- tag(nullptr)
+ decoder(_decoder), input_stream(_input_stream)
{
}
-flac_data::~flac_data()
-{
- delete tag;
-}
-
static enum sample_format
flac_sample_format(unsigned bits_per_sample)
{
@@ -116,9 +110,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
decoder_mixramp(data->decoder,
mixramp_start, mixramp_end);
- if (data->tag != nullptr)
- flac_vorbis_comments_to_tag(data->tag,
- &block->data.vorbis_comment);
+ flac_vorbis_comments_to_tag(data->tag,
+ &block->data.vorbis_comment);
default:
break;