1 files changed, 27 insertions, 35 deletions

diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c
index 0c0d994b7..17d0e8519 100644
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -18,6 +18,7 @@
  */
 
 #include "_flac_common.h"
+#include "flac_metadata.h"
 
 #include <glib.h>
 
@@ -268,12 +269,8 @@ flac_tag_load(const char *file, const char *char_tnum)
 		block = FLAC__metadata_simple_iterator_get_block(it);
 		if (!block)
 			break;
-		if (block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-			flac_vorbis_comments_to_tag(tag, char_tnum, block);
-		} else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
-			tag->time = ((float)block->data.stream_info.total_samples) /
-			    block->data.stream_info.sample_rate + 0.5;
-		}
+
+		flac_tag_apply_metadata(tag, char_tnum, block);
 		FLAC__metadata_object_delete(block);
 	} while (FLAC__metadata_simple_iterator_next(it));
 
@@ -300,6 +297,8 @@ flac_cue_tag_load(const char *file)
 	FLAC__uint64 track_time = 0;
 #ifdef HAVE_CUE /* libcue */
 	FLAC__StreamMetadata* vc;
+	char* cs_filename;
+	FILE* cs_file;
 #endif /* libcue */
 	FLAC__StreamMetadata* si = FLAC__metadata_object_new(FLAC__METADATA_TYPE_STREAMINFO);
 	FLAC__StreamMetadata* cs;
@@ -329,16 +328,25 @@ flac_cue_tag_load(const char *file)
 
 		FLAC__metadata_object_delete(vc);
 	}
+
+	if (tag == NULL) {
+		cs_filename = g_strconcat(file, ".cue", NULL);
+
+		cs_file = fopen(cs_filename, "rt");
+		g_free(cs_filename);
+
+		if (cs_file != NULL) {
+			tag = cue_tag_file(cs_file, tnum);
+			fclose(cs_file);
+		}
+	}
 #endif /* libcue */
 
 	if (tag == NULL)
 		tag = flac_tag_load(file, char_tnum);
 
-	if (char_tnum != NULL)
-	{
-		tag_add_item(	tag,
-				TAG_ITEM_TRACK,
-				char_tnum);
+	if (char_tnum != NULL) {
+		tag_add_item(tag, TAG_TRACK, char_tnum);
 		g_free(char_tnum);
 	}
 
@@ -474,13 +482,8 @@ flac_decode_internal(struct decoder * decoder,
 	}
 
 fail:
-	if (data.replay_gain_info)
-		replay_gain_info_free(data.replay_gain_info);
-
-	tag_free(data.tag);
-
-	if (flac_dec)
-		flac_delete(flac_dec);
+	flac_data_deinit(&data);
+	flac_delete(flac_dec);
 
 	if (err)
 		g_warning("%s\n", err);
@@ -653,11 +656,8 @@ fail:
 	if (pathname)
 		g_free(pathname);
 
-	if (data.replay_gain_info)
-		replay_gain_info_free(data.replay_gain_info);
-
-	if (flac_dec)
-		flac_delete(flac_dec);
+	flac_data_deinit(&data);
+	flac_delete(flac_dec);
 
 	if (err)
 		g_warning("%s\n", err);
@@ -776,11 +776,8 @@ flac_filedecode_internal(struct decoder* decoder,
 	}
 
 fail:
-	if (data.replay_gain_info)
-		replay_gain_info_free(data.replay_gain_info);
-
-	if (flac_dec)
-		flac_delete(flac_dec);
+	flac_data_deinit(&data);
+	flac_delete(flac_dec);
 
 	if (err)
 		g_warning("%s\n", err);
@@ -836,13 +833,8 @@ oggflac_tag_dup(const char *file)
 	do {
 		if (!(block = FLAC__metadata_iterator_get_block(it)))
 			break;
-		if (block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-			flac_vorbis_comments_to_tag(ret, NULL, block);
-		} else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
-			ret->time = ((float)block->data.stream_info.
-				     total_samples) /
-			    block->data.stream_info.sample_rate + 0.5;
-		}
+
+		flac_tag_apply_metadata(ret, NULL, block);
 	} while (FLAC__metadata_iterator_next(it));
 	FLAC__metadata_iterator_delete(it);