mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-17 12:34:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

A few changes to make the interface more flexible. It can now remove

Browse Source 
tags including ID3v2.


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@334981 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Allan Sandfeld Jensen
2004-08-01 23:29:42 +00:00
parent 06122de67f
commit 15f864a779
4 changed files with 271 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
mpc/mpcfile.cpp
View File

@ -28,7 +28,7 @@
#include "id3v2header.h"
#include "apetag.h"
#include "apefooter.h"
#include "mpctag.h"
#include "combinedtag.h"
using namespace TagLib;
@ -107,19 +107,44 @@ MPC::Properties *MPC::File::audioProperties() const
bool MPC::File::save()
{
if(readOnly()) {
debug("MPC::File::save() -- File is read only.");
return false;
}
// Possibly strip ID3v2 tag
if(d->hasID3v2 && !d->ID3v2Header) {
removeBlock(d->ID3v2Location, d->ID3v2Size);
d->hasID3v2 = false;
if(d->hasID3v1)
d->ID3v1Location -= d->ID3v2Size;
if(d->hasAPE)
d->APELocation -= d->ID3v2Size;
}
// Update ID3v1 tag
if(d->ID3v1Tag) {
if(d->hasID3v1) {
seek(-128, End);
seek(d->ID3v1Location);
writeBlock(d->ID3v1Tag->render());
}
else {
seek(0, End);
d->ID3v1Location = tell();
writeBlock(d->ID3v1Tag->render());
d->hasID3v1 = true;
}
} else
if(d->hasID3v1) {
removeBlock(d->ID3v1Location, 128);
d->hasID3v1 = false;
if(d->hasAPE) {
if(d->APELocation < d->ID3v1Location)
d->APELocation -= 128;
}
}
}
// Update APE tag
@ -128,15 +153,30 @@ bool MPC::File::save()
insert(d->APETag->render(), d->APELocation, d->APESize);
else {
if(d->hasID3v1) {
seek(-128, End);
insert(d->APETag->render(), tell(), 0);
insert(d->APETag->render(), d->ID3v1Location, 0);
d->APESize = d->APETag->footer()->completeTagSize();
d->hasAPE = true;
d->APELocation = d->ID3v1Location;
d->ID3v1Location += d->APESize;
}
else {
seek(0, End);
d->APELocation = tell();
writeBlock(d->APETag->render());
d->APESize = d->APETag->footer()->completeTagSize();
d->hasAPE = true;
}
}
}
else
if(d->hasAPE) {
removeBlock(d->APELocation, d->APESize);
d->hasAPE = false;
if(d->hasID3v1) {
if (d->ID3v1Location > d->APELocation)
d->ID3v1Location -= d->APESize;
}
}
return true;
}
@ -175,6 +215,35 @@ APE::Tag *MPC::File::APETag(bool create)
return d->APETag;
}
void MPC::File::remove(int tags)
{
if(tags & ID3v1) {
delete d->ID3v1Tag;
d->ID3v1Tag = 0;
if(d->APETag)
d->tag = d->APETag;
else
d->tag = d->APETag = new APE::Tag();
}
if(tags & ID3v2) {
delete d->ID3v2Header;
d->ID3v2Header = 0;
}
if(tags & APE) {
delete d->APETag;
d->APETag = 0;
if(d->ID3v1Tag)
d->tag = d->ID3v1Tag;
else
d->tag = d->APETag = new APE::Tag();
}
}
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
@ -194,8 +263,6 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
findAPE();
// Look for an APE tag
d->APELocation = findAPE();
if(d->APELocation >= 0) {
@ -243,17 +310,19 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
long MPC::File::findAPE()
{
if(isValid()) {
if(d->hasID3v1)
seek(-160, End);
else
seek(-32, End);
if(!isValid())
return -1;
long p = tell();
if(d->hasID3v1)
seek(-160, End);
else
seek(-32, End);
long p = tell();
if(readBlock(8) == APE::Tag::fileIdentifier())
return p;
if(readBlock(8) == APE::Tag::fileIdentifier())
return p;
}
return -1;
}