moved fallback APE/ID3 tag loader to song.c

Some plugins used the APE or ID3 tag loader as a fallback when their
own methods of loading tags did not work.  Move this code out of all
decoder plugins, into song_file_update().

1 files changed, 4 insertions, 9 deletions

diff --git a/src/decoder/mpc_plugin.c b/src/decoder/mpc_plugin.c
index 5ef2c5448..23fa5787b 100644
--- a/src/decoder/mpc_plugin.c
+++ b/src/decoder/mpc_plugin.c
@@ -249,8 +249,8 @@ static float mpcGetTime(const char *file)
 
 static struct tag *mpcTagDup(const char *file)
 {
-	struct tag *ret = NULL;
 	float total_time = mpcGetTime(file);
+	struct tag *tag;
 
 	if (total_time < 0) {
 		g_debug("mpcTagDup: Failed to get Songlength of file: %s\n",
@@ -258,14 +258,9 @@ static struct tag *mpcTagDup(const char *file)
 		return NULL;
 	}
 
-	ret = tag_ape_load(file);
-	if (!ret)
-		ret = tag_id3_load(file);
-	if (!ret)
-		ret = tag_new();
-	ret->time = total_time;
-
-	return ret;
+	tag = tag_new();
+	tag->time = total_time;
+	return tag;
 }
 
 static const char *const mpcSuffixes[] = { "mpc", NULL };