mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-08-06 22:34:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tabs be gone

Browse Source
This commit is contained in:
Scott Wheeler
2011-06-26 21:37:01 +02:00
parent 937d69f91d
commit 843070ba18
11 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
View File

@ -136,7 +136,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
int pos = 1;
d->mimeType = readStringField(data, String::Latin1, &pos);
/* Now we need at least two more bytes available */
/* Now we need at least two more bytes available */
if (uint(pos) + 1 >= data.size()) {
debug("Truncated picture frame.");
return;

4
taglib/mpeg/id3v2/id3v2framefactory.cpp
View File

@ -185,13 +185,13 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
// ID3v2.2 Attached Picture
if(frameID == "PIC") {
if(frameID == "PIC") {
AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header);
d->setTextEncoding(f);
return f;
}
// Relative Volume Adjustment (frames 4.11)
// Relative Volume Adjustment (frames 4.11)
if(frameID == "RVA2")
return new RelativeVolumeFrame(data, header);

11
taglib/mpeg/mpegfile.cpp
View File

@ -201,7 +201,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
// APE tag location has changed, update if it exists
if(APETag())
findAPE();
findAPE();
}
else if(stripOthers)
success = strip(ID3v2, false) && success;
@ -239,9 +239,10 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
else {
seek(0, End);
d->APELocation = tell();
d->APEFooterLocation = d->APELocation
+ d->tag.access<APE::Tag>(APEIndex, false)->footer()->completeTagSize()
- APE::Footer::size();
APE::Tag *apeTag = d->tag.access<APE::Tag>(APEIndex, false);
d->APEFooterLocation = d->APELocation
+ apeTag->footer()->completeTagSize()
- APE::Footer::size();
writeBlock(APETag()->render());
d->APEOriginalSize = APETag()->footer()->completeTagSize();
d->hasAPE = true;
@ -587,7 +588,7 @@ void MPEG::File::findAPE()
seek(d->APEFooterLocation);
APE::Footer footer(readBlock(APE::Footer::size()));
d->APELocation = d->APEFooterLocation - footer.completeTagSize()
+ APE::Footer::size();
+ APE::Footer::size();
return;
}
}