mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-18 04:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

standard style nitpicks and make it build with gcc 2.95

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@331313 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler
2004-07-20 22:30:00 +00:00
parent 2fd6401354
commit 382f8194c1
4 changed files with 139 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mpc/mpcfile.cpp
View File

@ -82,7 +82,7 @@ public:
////////////////////////////////////////////////////////////////////////////////
MPC::File::File(const char *file, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
{
d = new FilePrivate;
read(readProperties, propertiesStyle);
@ -95,14 +95,15 @@ MPC::File::~File()
TagLib::Tag *MPC::File::tag() const
{
if (d->APETag)
return d->APETag;
else
if (d->ID3v1Tag)
return d->ID3v1Tag;
else {
d->APETag = new APE::Tag;
if(d->APETag)
return d->APETag;
else {
if(d->ID3v1Tag)
return d->ID3v1Tag;
else {
d->APETag = new APE::Tag;
return d->APETag;
}
}
}
@ -111,28 +112,21 @@ MPC::Properties *MPC::File::audioProperties() const
return d->properties;
}
bool MPC::File::save()
{
// Update APE tag
if(d->hasAPE && d->APETag)
{
insert(d->APETag->render(), d->APELocation, d->APESize);
else {
// Update ID3v1 tag
if(d->hasID3v1 && d->ID3v1Tag) {
seek(-128, End);
writeBlock(d->ID3v1Tag->render());
}
}
else
// Update ID3v1 tag
if(d->hasID3v1 && d->ID3v1Tag)
{
seek(-128, End);
writeBlock(d->ID3v1Tag->render());
}
return true;
}
////////////////////////////////////////////////////////////////////////////////
@ -152,7 +146,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
// Look for an ID3v1 tag
if (!d->hasAPE) {
if(!d->hasAPE) {
d->ID3v1Location = findID3v1();
if(d->ID3v1Location >= 0) {
@ -172,7 +166,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
d->hasID3v2 = true;
}
if (d->hasID3v2)
if(d->hasID3v2)
seek(d->ID3v2Location + d->ID3v2Size);
else
seek(0);
@ -187,7 +181,6 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
bool MPC::File::findAPE()
{
if(!isValid())
return false;
@ -195,8 +188,7 @@ bool MPC::File::findAPE()
long p = tell();
ByteVector footer = readBlock(32);
if(footer.mid(0,8) == APE::Tag::fileIdentifier())
{
if(footer.mid(0,8) == APE::Tag::fileIdentifier()) {
d->APEFooter = p;
d->APESize = APE::Tag::tagSize(footer);
d->APELocation = p + 32 - d->APESize;