mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-12 20:52:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix the APE positioning code. This obviously never worked properly...

Browse Source 
BUG:112904


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@774316 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler
2008-02-12 23:45:42 +00:00
parent 8ed12b31d3
commit 8cfcb4823f
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
taglib/ape/apetag.cpp
View File

@ -31,7 +31,6 @@
#define WANT_CLASS_INSTANTIATION_OF_MAP (1)
#endif
#include <tdebug.h>
#include <tfile.h>
#include <tstring.h>
#include <tmap.h>
@ -46,10 +45,10 @@ using namespace APE;
class APE::Tag::TagPrivate
{
public:
TagPrivate() : file(0), tagOffset(-1), tagLength(0) {}
TagPrivate() : file(0), footerLocation(-1), tagLength(0) {}
File *file;
long tagOffset;
long footerLocation;
long tagLength;
Footer footer;
@ -66,11 +65,11 @@ APE::Tag::Tag() : TagLib::Tag()
d = new TagPrivate;
}
APE::Tag::Tag(File *file, long tagOffset) : TagLib::Tag()
APE::Tag::Tag(File *file, long footerLocation) : TagLib::Tag()
{
d = new TagPrivate;
d->file = file;
d->tagOffset = tagOffset;
d->footerLocation = footerLocation;
read();
}
@ -217,14 +216,14 @@ void APE::Tag::read()
{
if(d->file && d->file->isValid()) {
d->file->seek(d->tagOffset);
d->file->seek(d->footerLocation);
d->footer.setData(d->file->readBlock(Footer::size()));
if(d->footer.tagSize() <= Footer::size() ||
d->footer.tagSize() > uint(d->file->length()))
return;
d->file->seek(d->tagOffset + Footer::size() - d->footer.tagSize());
d->file->seek(d->footerLocation + Footer::size() - d->footer.tagSize());
parse(d->file->readBlock(d->footer.tagSize() - Footer::size()));
}
}

2
taglib/ape/apetag.h
View File

@ -66,7 +66,7 @@ namespace TagLib {
* Create an APE tag and parse the data in \a file with APE footer at
* \a tagOffset.
*/
Tag(File *file, long tagOffset);
Tag(File *file, long footerLocation);
/*!
* Destroys this Tag instance.