From 5395f5f6b34b6a98e94c8f3e8329150a2a4b9cac Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 17 Jan 2009 13:23:42 +0100 Subject: 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(). --- src/decoder/flac_plugin.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/decoder/flac_plugin.c') diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c index e02c13638..19f8d7fd4 100644 --- a/src/decoder/flac_plugin.c +++ b/src/decoder/flac_plugin.c @@ -282,23 +282,7 @@ flac_tag_load(const char *file) static struct tag * flac_tag_dup(const char *file) { - struct tag *ret = NULL; - - ret = flac_tag_load(file); - if (!ret) { - g_debug("Failed to grab information from: %s\n", file); - return NULL; - } - if (tag_is_empty(ret)) { - struct tag *temp = tag_id3_load(file); - if (temp) { - temp->time = ret->time; - tag_free(ret); - ret = temp; - } - } - - return ret; + return flac_tag_load(file); } static void -- cgit v1.2.3