1 files changed, 14 insertions, 21 deletions

diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_plugin.c
index c0e7e35e1..d4ba7b213 100644
--- a/src/decoder/oggflac_plugin.c
+++ b/src/decoder/oggflac_plugin.c
@@ -23,17 +23,15 @@
 
 #include "_flac_common.h"
 #include "_ogg_common.h"
+#include "flac_metadata.h"
 
 #include <glib.h>
 #include <OggFLAC/seekable_stream_decoder.h>
 #include <assert.h>
 #include <unistd.h>
 
-static void oggflac_cleanup(struct flac_data *data,
-			    OggFLAC__SeekableStreamDecoder * decoder)
+static void oggflac_cleanup(OggFLAC__SeekableStreamDecoder * decoder)
 {
-	if (data->replay_gain_info)
-		replay_gain_info_free(data->replay_gain_info);
 	if (decoder)
 		OggFLAC__seekable_stream_decoder_delete(decoder);
 }
@@ -173,17 +171,7 @@ static void of_metadata_dup_cb(G_GNUC_UNUSED const OggFLAC__SeekableStreamDecode
 
 	assert(data->tag != NULL);
 
-	switch (block->type) {
-	case FLAC__METADATA_TYPE_STREAMINFO:
-		data->tag->time = ((float)block->data.stream_info.
-				   total_samples) /
-		    block->data.stream_info.sample_rate + 0.5;
-		return;
-	case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-		flac_vorbis_comments_to_tag(data->tag, NULL, block);
-	default:
-		break;
-	}
+	flac_tag_apply_metadata(data->tag, NULL, block);
 }
 
 /* used by decode */
@@ -264,6 +252,7 @@ oggflac_tag_dup(const char *file)
 	struct input_stream input_stream;
 	OggFLAC__SeekableStreamDecoder *decoder;
 	struct flac_data data;
+	struct tag *tag;
 
 	if (!input_stream_open(&input_stream, file))
 		return NULL;
@@ -284,15 +273,18 @@ oggflac_tag_dup(const char *file)
 	 * data.tag will be set or unset, that's all we care about */
 	decoder = full_decoder_init_and_read_metadata(&data, 1);
 
-	oggflac_cleanup(&data, decoder);
+	oggflac_cleanup(decoder);
 	input_stream_close(&input_stream);
 
-	if (!tag_is_defined(data.tag)) {
-		tag_free(data.tag);
+	if (tag_is_defined(data.tag)) {
+		tag = data.tag;
 		data.tag = NULL;
-	}
+	} else
+		tag = NULL;
+
+	flac_data_deinit(&data);
 
-	return data.tag;
+	return tag;
 }
 
 static void
@@ -352,7 +344,8 @@ oggflac_decode(struct decoder * mpd_decoder, struct input_stream *input_stream)
 	}
 
 fail:
-	oggflac_cleanup(&data, decoder);
+	oggflac_cleanup(decoder);
+	flac_data_deinit(&data);
 }
 
 static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };