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().
This commit is contained in:
Max Kellermann
2009-01-17 13:23:42 +01:00
parent 43eefe9c41
commit 5395f5f6b3
7 changed files with 55 additions and 58 deletions

View File

@@ -405,21 +405,7 @@ mp4_load_tag(const char *file)
static struct tag *
mp4_tag_dup(const char *file)
{
struct tag *ret = NULL;
ret = mp4_load_tag(file);
if (!ret)
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 mp4_load_tag(file);
}
static const char *const mp4_suffixes[] = { "m4a", "mp4", NULL };