mirror of
https://github.com/taglib/taglib.git
synced 2025-05-27 21:20:26 -04:00
Remove trailing whitespace
This commit is contained in:
parent
e5ede410bc
commit
06597123b8
@ -104,7 +104,7 @@ typedef enum {
|
||||
/*!
|
||||
* Creates a TagLib file based on \a filename. TagLib will try to guess the file
|
||||
* type.
|
||||
*
|
||||
*
|
||||
* \returns NULL if the file type cannot be determined or the file cannot
|
||||
* be opened.
|
||||
*/
|
||||
|
@ -71,7 +71,7 @@ APE::Item::Item(const String &key, const ByteVector &value, bool binary)
|
||||
d->value = value;
|
||||
}
|
||||
else
|
||||
d->text.append(value);
|
||||
d->text.append(value);
|
||||
}
|
||||
|
||||
APE::Item::Item(const Item &item)
|
||||
@ -172,7 +172,7 @@ int APE::Item::size() const
|
||||
case Text:
|
||||
if(d->text.size()) {
|
||||
StringList::ConstIterator it = d->text.begin();
|
||||
|
||||
|
||||
result += it->data(String::UTF8).size();
|
||||
it++;
|
||||
for(; it != d->text.end(); ++it)
|
||||
|
@ -70,7 +70,7 @@ namespace TagLib
|
||||
/*!
|
||||
* Constructs an attribute with \a key and a BytesType \a value.
|
||||
*/
|
||||
Attribute(const ByteVector &value);
|
||||
Attribute(const ByteVector &value);
|
||||
|
||||
/*!
|
||||
* Constructs an attribute with \a key and a Picture \a value.
|
||||
|
@ -368,14 +368,14 @@ ByteVector ASF::File::HeaderExtensionObject::render(ASF::File *file)
|
||||
// public members
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle)
|
||||
ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle)
|
||||
: TagLib::File(file)
|
||||
{
|
||||
d = new FilePrivate;
|
||||
read(readProperties, propertiesStyle);
|
||||
}
|
||||
|
||||
ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle)
|
||||
ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle)
|
||||
: TagLib::File(stream)
|
||||
{
|
||||
d = new FilePrivate;
|
||||
|
@ -56,7 +56,7 @@ ASF::Properties::Properties() : AudioProperties(AudioProperties::Average)
|
||||
ASF::Properties::~Properties()
|
||||
{
|
||||
if(d)
|
||||
delete d;
|
||||
delete d;
|
||||
}
|
||||
|
||||
int ASF::Properties::length() const
|
||||
@ -77,7 +77,7 @@ int ASF::Properties::sampleRate() const
|
||||
int ASF::Properties::channels() const
|
||||
{
|
||||
return d->channels;
|
||||
}
|
||||
}
|
||||
|
||||
bool ASF::Properties::isEncrypted() const
|
||||
{
|
||||
|
@ -73,4 +73,4 @@ namespace TagLib {
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -120,17 +120,17 @@ namespace TagLib {
|
||||
virtual void setComment(const String &s);
|
||||
|
||||
/*!
|
||||
* Sets the rating to \a s.
|
||||
* Sets the rating to \a s.
|
||||
*/
|
||||
virtual void setRating(const String &s);
|
||||
|
||||
/*!
|
||||
* Sets the copyright to \a s.
|
||||
* Sets the copyright to \a s.
|
||||
*/
|
||||
virtual void setCopyright(const String &s);
|
||||
|
||||
/*!
|
||||
* Sets the genre to \a s.
|
||||
* Sets the genre to \a s.
|
||||
*/
|
||||
virtual void setGenre(const String &s);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/***************************************************************************
|
||||
copyright : (C) 2002 - 2008 by Scott Wheeler
|
||||
email : wheeler@kde.org
|
||||
|
||||
|
||||
copyright : (C) 2010 by Alex Novichkov
|
||||
email : novichko@atnet.ru
|
||||
(added APE file support)
|
||||
|
@ -218,7 +218,7 @@ namespace TagLib {
|
||||
* Returns a list of pictures attached to the FLAC file.
|
||||
*/
|
||||
List<Picture *> pictureList();
|
||||
|
||||
|
||||
/*!
|
||||
* Removes an attached picture. If \a del is true the picture's memory
|
||||
* will be freed; if it is false, it must be deleted by the user.
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
using namespace TagLib;
|
||||
|
||||
class FLAC::MetadataBlock::MetadataBlockPrivate
|
||||
class FLAC::MetadataBlock::MetadataBlockPrivate
|
||||
{
|
||||
public:
|
||||
MetadataBlockPrivate() {}
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
using namespace TagLib;
|
||||
|
||||
class FLAC::Picture::PicturePrivate
|
||||
class FLAC::Picture::PicturePrivate
|
||||
{
|
||||
public:
|
||||
PicturePrivate() :
|
||||
@ -117,7 +117,7 @@ bool FLAC::Picture::parse(const ByteVector &data)
|
||||
}
|
||||
d->data = data.mid(pos, dataLength);
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
ByteVector FLAC::Picture::render() const
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
using namespace TagLib;
|
||||
|
||||
class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
|
||||
class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
|
||||
{
|
||||
public:
|
||||
UnknownMetadataBlockPrivate() : code(0) {}
|
||||
|
@ -125,7 +125,7 @@ bool IT::File::save()
|
||||
ulong sampleOffset = 0;
|
||||
if(!readU32L(sampleOffset))
|
||||
return false;
|
||||
|
||||
|
||||
seek(sampleOffset + 20);
|
||||
|
||||
if((i + instrumentCount) < lines.size())
|
||||
@ -206,7 +206,7 @@ void IT::File::read(bool)
|
||||
READ_U16L_AS(length);
|
||||
READ_U16L_AS(instrumentCount);
|
||||
READ_U16L_AS(sampleCount);
|
||||
|
||||
|
||||
d->properties.setInstrumentCount(instrumentCount);
|
||||
d->properties.setSampleCount(sampleCount);
|
||||
READ_U16L(d->properties.setPatternCount);
|
||||
@ -255,7 +255,7 @@ void IT::File::read(bool)
|
||||
++channels;
|
||||
}
|
||||
d->properties.setChannels(channels);
|
||||
|
||||
|
||||
// real length might be shorter because of skips and terminator
|
||||
ushort realLength = 0;
|
||||
for(ushort i = 0; i < length; ++ i) {
|
||||
@ -287,11 +287,11 @@ void IT::File::read(bool)
|
||||
READ_STRING_AS(instrumentName, 26);
|
||||
comment.append(instrumentName);
|
||||
}
|
||||
|
||||
|
||||
for(ushort i = 0; i < sampleCount; ++ i) {
|
||||
seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
|
||||
READ_U32L_AS(sampleOffset);
|
||||
|
||||
|
||||
seek(sampleOffset);
|
||||
|
||||
ByteVector sampleMagic = readBlock(4);
|
||||
@ -317,7 +317,7 @@ void IT::File::read(bool)
|
||||
READ_BYTE_AS(vibratoRate);
|
||||
READ_BYTE_AS(vibratoType);
|
||||
*/
|
||||
|
||||
|
||||
comment.append(sampleName);
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,7 @@ namespace TagLib {
|
||||
|
||||
Properties(AudioProperties::ReadStyle propertiesStyle);
|
||||
virtual ~Properties();
|
||||
|
||||
|
||||
int length() const;
|
||||
int bitrate() const;
|
||||
int sampleRate() const;
|
||||
|
@ -33,7 +33,7 @@ public:
|
||||
lengthInPatterns(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
int channels;
|
||||
uint instrumentCount;
|
||||
uchar lengthInPatterns;
|
||||
|
@ -34,7 +34,7 @@ namespace TagLib {
|
||||
public:
|
||||
Properties(AudioProperties::ReadStyle propertiesStyle);
|
||||
virtual ~Properties();
|
||||
|
||||
|
||||
int length() const;
|
||||
int bitrate() const;
|
||||
int sampleRate() const;
|
||||
|
@ -150,10 +150,10 @@ namespace TagLib {
|
||||
/*!
|
||||
* Sets the tracker name to \a trackerName. If \a trackerName is
|
||||
* String::null then this value will be cleared.
|
||||
*
|
||||
*
|
||||
* Note that only XM files support this tag. Setting the
|
||||
* tracker name for other module file formats will be ignored.
|
||||
*
|
||||
*
|
||||
* The length of this tag is limited to 20 characters (1 character
|
||||
* = 1 byte).
|
||||
*/
|
||||
|
@ -98,7 +98,7 @@ void PrivateFrame::parseFields(const ByteVector &data)
|
||||
}
|
||||
|
||||
// Owner identifier is assumed to be Latin1
|
||||
|
||||
|
||||
const int byteAlign = 1;
|
||||
const int endOfOwner = data.find(textDelimiter(String::Latin1), 0, byteAlign);
|
||||
|
||||
|
@ -281,8 +281,8 @@ void Ogg::File::writePageGroup(const List<int> &thePageGroup)
|
||||
return;
|
||||
|
||||
|
||||
// pages in the pageGroup and packets must be equivalent
|
||||
// (originalSize and size of packets would not work together),
|
||||
// pages in the pageGroup and packets must be equivalent
|
||||
// (originalSize and size of packets would not work together),
|
||||
// therefore we sometimes have to add pages to the group
|
||||
List<int> pageGroup(thePageGroup);
|
||||
while (!d->pages[pageGroup.back()]->header()->lastPacketCompleted()) {
|
||||
@ -341,7 +341,7 @@ void Ogg::File::writePageGroup(const List<int> &thePageGroup)
|
||||
|
||||
if (pages.back()->header()->pageSequenceNumber() != pageGroup.back()) {
|
||||
|
||||
// TODO: change the internal data structure so that we don't need to hold the
|
||||
// TODO: change the internal data structure so that we don't need to hold the
|
||||
// complete file in memory (is unavoidable at the moment)
|
||||
|
||||
// read the complete stream
|
||||
|
@ -116,9 +116,9 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const
|
||||
flags = ContainsPacketFlags(flags | CompletePacket);
|
||||
}
|
||||
|
||||
// Or if there is more than one page and the page is
|
||||
// (a) the first page and it's complete or
|
||||
// (b) the last page and it's complete or
|
||||
// Or if there is more than one page and the page is
|
||||
// (a) the first page and it's complete or
|
||||
// (b) the last page and it's complete or
|
||||
// (c) a page in the middle.
|
||||
else if(packetCount() > 1 &&
|
||||
((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
|
||||
@ -266,7 +266,7 @@ List<Ogg::Page *> Ogg::Page::paginate(const ByteVectorList &packets,
|
||||
}
|
||||
|
||||
Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued,
|
||||
lastPacketInList ? lastPacketCompleted : true,
|
||||
lastPacketInList ? lastPacketCompleted : true,
|
||||
isVeryLastPacket);
|
||||
pageIndex++;
|
||||
|
||||
|
@ -70,9 +70,9 @@ namespace TagLib {
|
||||
*/
|
||||
const PageHeader *header() const;
|
||||
|
||||
/*!
|
||||
/*!
|
||||
* Returns a copy of the page with \a sequenceNumber set as sequence number.
|
||||
*
|
||||
*
|
||||
* \see header()
|
||||
* \see PageHeader::setPageSequenceNumber()
|
||||
*/
|
||||
|
@ -189,7 +189,7 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data)
|
||||
d->chunks[i].padding = 1;
|
||||
offset++;
|
||||
}
|
||||
|
||||
|
||||
Chunk chunk;
|
||||
chunk.name = name;
|
||||
chunk.size = data.size();
|
||||
|
@ -118,7 +118,7 @@ bool S3M::File::save()
|
||||
}
|
||||
|
||||
seek(channels, Current);
|
||||
|
||||
|
||||
StringList lines = d->tag.comment().split("\n");
|
||||
// write comment as sample names:
|
||||
for(ushort i = 0; i < sampleCount; ++ i) {
|
||||
@ -189,7 +189,7 @@ void S3M::File::read(bool)
|
||||
if(setting != 0xff) ++ channels;
|
||||
}
|
||||
d->properties.setChannels(channels);
|
||||
|
||||
|
||||
seek(96);
|
||||
ushort realLength = 0;
|
||||
for(ushort i = 0; i < length; ++ i) {
|
||||
|
@ -42,7 +42,7 @@ public:
|
||||
bpmSpeed(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
ushort lengthInPatterns;
|
||||
int channels;
|
||||
bool stereo;
|
||||
|
@ -43,7 +43,7 @@ namespace TagLib {
|
||||
|
||||
Properties(AudioProperties::ReadStyle propertiesStyle);
|
||||
virtual ~Properties();
|
||||
|
||||
|
||||
int length() const;
|
||||
int bitrate() const;
|
||||
int sampleRate() const;
|
||||
|
@ -481,7 +481,7 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit
|
||||
target += withSize;
|
||||
offset += chunkSize + patternSize;
|
||||
}
|
||||
|
||||
|
||||
// replace private data:
|
||||
if(d->deref())
|
||||
delete d;
|
||||
|
@ -161,7 +161,7 @@ void WavPack::Properties::read()
|
||||
unsigned int samples = d->data.mid(12, 4).toUInt(false);
|
||||
if(samples == ~0u) {
|
||||
if(d->file && d->style != Fast) {
|
||||
samples = seekFinalIndex();
|
||||
samples = seekFinalIndex();
|
||||
}
|
||||
else {
|
||||
samples = 0;
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
bpmSpeed(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
ushort lengthInPatterns;
|
||||
int channels;
|
||||
ushort version;
|
||||
@ -57,7 +57,7 @@ XM::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
|
||||
AudioProperties(propertiesStyle),
|
||||
d(new PropertiesPrivate)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
XM::Properties::~Properties()
|
||||
{
|
||||
|
@ -38,7 +38,7 @@ namespace TagLib {
|
||||
|
||||
Properties(AudioProperties::ReadStyle propertiesStyle);
|
||||
virtual ~Properties();
|
||||
|
||||
|
||||
int length() const;
|
||||
int bitrate() const;
|
||||
int sampleRate() const;
|
||||
|
@ -164,7 +164,7 @@ public:
|
||||
f = new ASF::File(newname.c_str());
|
||||
ASF::AttributeList values2 = f->tag()->attributeListMap()["WM/Picture"];
|
||||
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), values2.size());
|
||||
ASF::Attribute attr2 = values2.front();
|
||||
ASF::Attribute attr2 = values2.front();
|
||||
ASF::Picture picture2 = attr2.toPicture();
|
||||
CPPUNIT_ASSERT(picture2.isValid());
|
||||
CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), picture2.mimeType());
|
||||
|
@ -100,7 +100,7 @@ private:
|
||||
|
||||
IT::Properties *p = file.audioProperties();
|
||||
Mod::Tag *t = file.tag();
|
||||
|
||||
|
||||
CPPUNIT_ASSERT(0 != p);
|
||||
CPPUNIT_ASSERT(0 != t);
|
||||
|
||||
|
@ -102,7 +102,7 @@ private:
|
||||
|
||||
Mod::Properties *p = file.audioProperties();
|
||||
Mod::Tag *t = file.tag();
|
||||
|
||||
|
||||
CPPUNIT_ASSERT(0 != p);
|
||||
CPPUNIT_ASSERT(0 != t);
|
||||
|
||||
|
@ -90,7 +90,7 @@ private:
|
||||
|
||||
S3M::Properties *p = file.audioProperties();
|
||||
Mod::Tag *t = file.tag();
|
||||
|
||||
|
||||
CPPUNIT_ASSERT(0 != p);
|
||||
CPPUNIT_ASSERT(0 != t);
|
||||
|
||||
|
@ -122,7 +122,7 @@ public:
|
||||
|
||||
XM::Properties *p = file.audioProperties();
|
||||
Mod::Tag *t = file.tag();
|
||||
|
||||
|
||||
CPPUNIT_ASSERT(0 != p);
|
||||
CPPUNIT_ASSERT(0 != t);
|
||||
|
||||
@ -168,7 +168,7 @@ private:
|
||||
|
||||
XM::Properties *p = file.audioProperties();
|
||||
Mod::Tag *t = file.tag();
|
||||
|
||||
|
||||
CPPUNIT_ASSERT(0 != p);
|
||||
CPPUNIT_ASSERT(0 != t);
|
||||
|
||||
@ -193,7 +193,7 @@ private:
|
||||
CPPUNIT_ASSERT_EQUAL(0U, t->track());
|
||||
CPPUNIT_ASSERT_EQUAL(trackerName, t->trackerName());
|
||||
}
|
||||
|
||||
|
||||
void testWriteTags(const String &comment)
|
||||
{
|
||||
ScopedFileCopy copy("test", ".xm");
|
||||
|
Loading…
Reference in New Issue
Block a user