diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
| commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
| tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /src/libaudtag/id3/id3v1.cc | |
| parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
| parent | 66d524c01720835a30716cb6861606f95629faea (diff) | |
fix conflict
Diffstat (limited to 'src/libaudtag/id3/id3v1.cc')
| -rw-r--r-- | src/libaudtag/id3/id3v1.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libaudtag/id3/id3v1.cc b/src/libaudtag/id3/id3v1.cc index 96d7b5a..65ec9e5 100644 --- a/src/libaudtag/id3/id3v1.cc +++ b/src/libaudtag/id3/id3v1.cc @@ -24,6 +24,7 @@ #include <libaudcore/audstrings.h> #include <libaudtag/builtin.h> +#include <libaudtag/util.h> #pragma pack(push) #pragma pack(1) @@ -95,12 +96,8 @@ static bool combine_string (Tuple & tuple, Tuple::Field field, return true; } -bool ID3v1TagModule::read_tag (VFSFile & file, Tuple * ptuple, Index<char> * image) +bool ID3v1TagModule::read_tag (VFSFile & file, Tuple & tuple, Index<char> * image) { - if (! ptuple) - return true; // nothing to do - - Tuple & tuple = * ptuple; ID3v1Tag tag; ID3v1Ext ext; |