mirror of
https://github.com/taglib/taglib.git
synced 2026-02-13 11:43:06 -05:00
Ran my whitespace fixing script -- tabs -> spaces, removes trailing spaces.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@738725 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
@ -2,8 +2,8 @@
|
||||
copyright : (C) 2006 by Lukáš Lalinský
|
||||
email : lalinsky@gmail.com
|
||||
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
(original MPC implementation)
|
||||
***************************************************************************/
|
||||
|
||||
@ -33,10 +33,10 @@
|
||||
|
||||
#include "wavpackfile.h"
|
||||
#include "id3v1tag.h"
|
||||
#include "id3v2header.h"
|
||||
#include "id3v2header.h"
|
||||
#include "apetag.h"
|
||||
#include "apefooter.h"
|
||||
#include "combinedtag.h"
|
||||
#include "combinedtag.h"
|
||||
|
||||
using namespace TagLib;
|
||||
|
||||
@ -49,7 +49,7 @@ public:
|
||||
APESize(0),
|
||||
ID3v1Tag(0),
|
||||
ID3v1Location(-1),
|
||||
tag(0),
|
||||
tag(0),
|
||||
properties(0),
|
||||
scanned(false),
|
||||
hasAPE(false),
|
||||
@ -58,7 +58,7 @@ public:
|
||||
~FilePrivate()
|
||||
{
|
||||
if (tag != ID3v1Tag && tag != APETag) delete tag;
|
||||
delete ID3v1Tag;
|
||||
delete ID3v1Tag;
|
||||
delete APETag;
|
||||
delete properties;
|
||||
}
|
||||
@ -68,7 +68,7 @@ public:
|
||||
uint APESize;
|
||||
|
||||
ID3v1::Tag *ID3v1Tag;
|
||||
long ID3v1Location;
|
||||
long ID3v1Location;
|
||||
|
||||
Tag *tag;
|
||||
|
||||
@ -79,7 +79,7 @@ public:
|
||||
// this data structure does. This is used in computing offsets.
|
||||
|
||||
bool hasAPE;
|
||||
bool hasID3v1;
|
||||
bool hasID3v1;
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@ -169,7 +169,7 @@ bool WavPack::File::save()
|
||||
d->ID3v1Location -= d->APESize;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -228,7 +228,7 @@ void WavPack::File::remove(int tags)
|
||||
else
|
||||
d->tag = d->APETag = new APE::Tag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// private members
|
||||
@ -244,7 +244,7 @@ void WavPack::File::read(bool readProperties, Properties::ReadStyle /* propertie
|
||||
d->ID3v1Tag = new ID3v1::Tag(this, d->ID3v1Location);
|
||||
d->hasID3v1 = true;
|
||||
}
|
||||
|
||||
|
||||
// Look for an APE tag
|
||||
|
||||
d->APELocation = findAPE();
|
||||
@ -267,7 +267,7 @@ void WavPack::File::read(bool readProperties, Properties::ReadStyle /* propertie
|
||||
else
|
||||
d->tag = d->APETag = new APE::Tag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Look for WavPack audio properties
|
||||
|
||||
@ -308,4 +308,4 @@ long WavPack::File::findID3v1()
|
||||
return p;
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
copyright : (C) 2006 by Lukáš Lalinský
|
||||
email : lalinsky@gmail.com
|
||||
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
(original MPC implementation)
|
||||
***************************************************************************/
|
||||
|
||||
@ -47,7 +47,7 @@ namespace TagLib {
|
||||
* This is implementation of WavPack metadata.
|
||||
*
|
||||
* This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream
|
||||
* properties from the file.
|
||||
* properties from the file.
|
||||
*/
|
||||
|
||||
namespace WavPack {
|
||||
@ -95,7 +95,7 @@ namespace TagLib {
|
||||
/*!
|
||||
* Returns the Tag for this file. This will be an APE tag, an ID3v1 tag
|
||||
* or a combination of the two.
|
||||
*/
|
||||
*/
|
||||
virtual TagLib::Tag *tag() const;
|
||||
|
||||
/*!
|
||||
@ -121,14 +121,14 @@ namespace TagLib {
|
||||
* deleted by the user. It will be deleted when the file (object) is
|
||||
* destroyed.
|
||||
*/
|
||||
ID3v1::Tag *ID3v1Tag(bool create = false);
|
||||
ID3v1::Tag *ID3v1Tag(bool create = false);
|
||||
|
||||
/*!
|
||||
* Returns a pointer to the APE tag of the file.
|
||||
*
|
||||
* If \a create is false (the default) this will return a null pointer
|
||||
* if there is no valid APE tag. If \a create is true it will create
|
||||
* a APE tag if one does not exist.
|
||||
* a APE tag if one does not exist.
|
||||
*
|
||||
* \note The Tag <b>is still</b> owned by the APE::File and should not be
|
||||
* deleted by the user. It will be deleted when the file (object) is
|
||||
@ -144,15 +144,15 @@ namespace TagLib {
|
||||
* as their memory will be freed.
|
||||
* \note In order to make the removal permanent save() still needs to be called
|
||||
*/
|
||||
void remove(int tags = AllTags);
|
||||
|
||||
void remove(int tags = AllTags);
|
||||
|
||||
private:
|
||||
File(const File &);
|
||||
File &operator=(const File &);
|
||||
|
||||
void read(bool readProperties, Properties::ReadStyle propertiesStyle);
|
||||
void scan();
|
||||
long findID3v1();
|
||||
long findID3v1();
|
||||
long findAPE();
|
||||
|
||||
class FilePrivate;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
copyright : (C) 2006 by Lukáš Lalinský
|
||||
email : lalinsky@gmail.com
|
||||
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
(original MPC implementation)
|
||||
***************************************************************************/
|
||||
|
||||
@ -41,7 +41,7 @@ class WavPack::Properties::PropertiesPrivate
|
||||
public:
|
||||
PropertiesPrivate(const ByteVector &d, long length, ReadStyle s) :
|
||||
data(d),
|
||||
streamLength(length),
|
||||
streamLength(length),
|
||||
style(s),
|
||||
length(0),
|
||||
bitrate(0),
|
||||
@ -51,7 +51,7 @@ public:
|
||||
bitsPerSample(0) {}
|
||||
|
||||
ByteVector data;
|
||||
long streamLength;
|
||||
long streamLength;
|
||||
ReadStyle style;
|
||||
int length;
|
||||
int bitrate;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
copyright : (C) 2006 by Lukáš Lalinský
|
||||
email : lalinsky@gmail.com
|
||||
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
copyright : (C) 2004 by Allan Sandfeld Jensen
|
||||
email : kde@carewolf.org
|
||||
(original MPC implementation)
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user