taglib/taglib-1.5-1.6-ape.patch
Michael Schwendt f69b1b0917 - Cherry-pick bug-fix patches from 1.6 development (also replaces the old
taglib-1.5-kde#161721.patch):
169810)
107659)
Fixed overflow while calculating bitrate of FLAC files with a very high
    bitrate.
:year() now falls back to YEAR if DATE doesn't exist and
    XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
    exist. (BUG:144396)
:split().
:operator[] and in String::operator+=. (BUG:169389)
176373)
167786)
188578)
168382)
172556)
Added support for PRIV ID3v2 frames.
Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
Added support for the POPM (rating/playcount) ID3v2 frame.
161721)
2009-08-22 10:44:21 +00:00

33 lines
876 B
Diff

diff -Nur taglib-1.5/taglib/ape/apeitem.cpp taglib/taglib/ape/apeitem.cpp
--- taglib-1.5/taglib/ape/apeitem.cpp 2008-02-12 17:30:25.000000000 +0100
+++ taglib/taglib/ape/apeitem.cpp 2009-01-11 00:15:33.000000000 +0100
@@ -160,14 +160,14 @@
bool APE::Item::isEmpty() const
{
switch(d->type) {
- case 0:
- case 1:
+ case Text:
+ case Binary:
if(d->text.isEmpty())
return true;
if(d->text.size() == 1 && d->text.front().isEmpty())
return true;
return false;
- case 2:
+ case Locator:
return d->value.isEmpty();
default:
return false;
@@ -206,8 +206,9 @@
if(isEmpty())
return data;
- if(d->type != Item::Binary) {
+ if(d->type == Text) {
StringList::ConstIterator it = d->text.begin();
+
value.append(it->data(String::UTF8));
it++;
for(; it != d->text.end(); ++it) {