diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-17 13:23:42 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-17 13:23:42 +0100 |
| commit | 5395f5f6b34b6a98e94c8f3e8329150a2a4b9cac (patch) | |
| tree | bb1e42988bd79c452b667da84ef662b45da8aa8e /src/decoder/mp4_plugin.c | |
| parent | 43eefe9c41478f5605e4abd7e6c7fc6d710341e8 (diff) | |
| download | mpd-5395f5f6b34b6a98e94c8f3e8329150a2a4b9cac.tar.gz mpd-5395f5f6b34b6a98e94c8f3e8329150a2a4b9cac.tar.xz mpd-5395f5f6b34b6a98e94c8f3e8329150a2a4b9cac.zip | |
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().
Diffstat (limited to 'src/decoder/mp4_plugin.c')
| -rw-r--r-- | src/decoder/mp4_plugin.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/decoder/mp4_plugin.c b/src/decoder/mp4_plugin.c index bc36acf8a..fd7415137 100644 --- a/src/decoder/mp4_plugin.c +++ b/src/decoder/mp4_plugin.c @@ -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 }; |