Format taglib sources

This commit is contained in:
Jonas Kvinge
2020-06-13 19:02:42 +02:00
parent 72bff7fa35
commit 4ce099294c
224 changed files with 12905 additions and 15623 deletions

View File

@@ -42,22 +42,19 @@
using namespace Strawberry_TagLib::TagLib;
namespace
{
enum { WavAPEIndex, WavID3v1Index };
namespace {
enum { WavAPEIndex,
WavID3v1Index };
}
class WavPack::File::FilePrivate
{
public:
FilePrivate() :
APELocation(-1),
APESize(0),
ID3v1Location(-1),
properties(0) {}
class WavPack::File::FilePrivate {
public:
FilePrivate() : APELocation(-1),
APESize(0),
ID3v1Location(-1),
properties(0) {}
~FilePrivate()
{
~FilePrivate() {
delete properties;
}
@@ -75,8 +72,7 @@ public:
// static members
////////////////////////////////////////////////////////////////////////////////
bool WavPack::File::isSupported(IOStream *stream)
{
bool WavPack::File::isSupported(IOStream *stream) {
// A WavPack file has to start with "wvpk".
const ByteVector id = Utils::readHeader(stream, 4, false);
@@ -87,69 +83,58 @@ bool WavPack::File::isSupported(IOStream *stream)
// public members
////////////////////////////////////////////////////////////////////////////////
WavPack::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
WavPack::File::File(FileName file, bool readProperties, Properties::ReadStyle) : Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate()) {
if (isOpen())
read(readProperties);
}
WavPack::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
WavPack::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate()) {
if (isOpen())
read(readProperties);
}
WavPack::File::~File()
{
WavPack::File::~File() {
delete d;
}
Strawberry_TagLib::TagLib::Tag *WavPack::File::tag() const
{
Strawberry_TagLib::TagLib::Tag *WavPack::File::tag() const {
return &d->tag;
}
PropertyMap WavPack::File::properties() const
{
PropertyMap WavPack::File::properties() const {
return d->tag.properties();
}
void WavPack::File::removeUnsupportedProperties(const StringList &unsupported)
{
void WavPack::File::removeUnsupportedProperties(const StringList &unsupported) {
d->tag.removeUnsupportedProperties(unsupported);
}
PropertyMap WavPack::File::setProperties(const PropertyMap &properties)
{
if(ID3v1Tag())
PropertyMap WavPack::File::setProperties(const PropertyMap &properties) {
if (ID3v1Tag())
ID3v1Tag()->setProperties(properties);
return APETag(true)->setProperties(properties);
}
WavPack::Properties *WavPack::File::audioProperties() const
{
WavPack::Properties *WavPack::File::audioProperties() const {
return d->properties;
}
bool WavPack::File::save()
{
if(readOnly()) {
bool WavPack::File::save() {
if (readOnly()) {
debug("WavPack::File::save() -- File is read only.");
return false;
}
// Update ID3v1 tag
if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
// ID3v1 tag is not empty. Update the old one or create a new one.
if(d->ID3v1Location >= 0) {
if (d->ID3v1Location >= 0) {
seek(d->ID3v1Location);
}
else {
@@ -163,7 +148,7 @@ bool WavPack::File::save()
// ID3v1 tag is empty. Remove the old one.
if(d->ID3v1Location >= 0) {
if (d->ID3v1Location >= 0) {
truncate(d->ID3v1Location);
d->ID3v1Location = -1;
}
@@ -171,12 +156,12 @@ bool WavPack::File::save()
// Update APE tag
if(APETag() && !APETag()->isEmpty()) {
if (APETag() && !APETag()->isEmpty()) {
// APE tag is not empty. Update the old one or create a new one.
if(d->APELocation < 0) {
if(d->ID3v1Location >= 0)
if (d->APELocation < 0) {
if (d->ID3v1Location >= 0)
d->APELocation = d->ID3v1Location;
else
d->APELocation = length();
@@ -185,7 +170,7 @@ bool WavPack::File::save()
const ByteVector data = APETag()->render();
insert(data, d->APELocation, d->APESize);
if(d->ID3v1Location >= 0)
if (d->ID3v1Location >= 0)
d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
d->APESize = data.size();
@@ -194,10 +179,10 @@ bool WavPack::File::save()
// APE tag is empty. Remove the old one.
if(d->APELocation >= 0) {
if (d->APELocation >= 0) {
removeBlock(d->APELocation, d->APESize);
if(d->ID3v1Location >= 0)
if (d->ID3v1Location >= 0)
d->ID3v1Location -= d->APESize;
d->APELocation = -1;
@@ -208,35 +193,30 @@ bool WavPack::File::save()
return true;
}
ID3v1::Tag *WavPack::File::ID3v1Tag(bool create)
{
ID3v1::Tag *WavPack::File::ID3v1Tag(bool create) {
return d->tag.access<ID3v1::Tag>(WavID3v1Index, create);
}
APE::Tag *WavPack::File::APETag(bool create)
{
APE::Tag *WavPack::File::APETag(bool create) {
return d->tag.access<APE::Tag>(WavAPEIndex, create);
}
void WavPack::File::strip(int tags)
{
if(tags & ID3v1)
void WavPack::File::strip(int tags) {
if (tags & ID3v1)
d->tag.set(WavID3v1Index, 0);
if(tags & APE)
if (tags & APE)
d->tag.set(WavAPEIndex, 0);
if(!ID3v1Tag())
if (!ID3v1Tag())
APETag(true);
}
bool WavPack::File::hasID3v1Tag() const
{
bool WavPack::File::hasID3v1Tag() const {
return (d->ID3v1Location >= 0);
}
bool WavPack::File::hasAPETag() const
{
bool WavPack::File::hasAPETag() const {
return (d->APELocation >= 0);
}
@@ -244,37 +224,36 @@ bool WavPack::File::hasAPETag() const
// private members
////////////////////////////////////////////////////////////////////////////////
void WavPack::File::read(bool readProperties)
{
void WavPack::File::read(bool readProperties) {
// Look for an ID3v1 tag
d->ID3v1Location = Utils::findID3v1(this);
if(d->ID3v1Location >= 0)
if (d->ID3v1Location >= 0)
d->tag.set(WavID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
// Look for an APE tag
d->APELocation = Utils::findAPE(this, d->ID3v1Location);
if(d->APELocation >= 0) {
if (d->APELocation >= 0) {
d->tag.set(WavAPEIndex, new APE::Tag(this, d->APELocation));
d->APESize = APETag()->footer()->completeTagSize();
d->APELocation = d->APELocation + APE::Footer::size() - d->APESize;
}
if(d->ID3v1Location >= 0)
if (d->ID3v1Location >= 0)
APETag(true);
// Look for WavPack audio properties
if(readProperties) {
if (readProperties) {
long streamLength;
if(d->APELocation >= 0)
if (d->APELocation >= 0)
streamLength = d->APELocation;
else if(d->ID3v1Location >= 0)
else if (d->ID3v1Location >= 0)
streamLength = d->ID3v1Location;
else
streamLength = length();

View File

@@ -37,58 +37,61 @@
namespace Strawberry_TagLib {
namespace TagLib {
class Tag;
class Tag;
namespace ID3v1 { class Tag; }
namespace APE { class Tag; }
namespace ID3v1 {
class Tag;
}
namespace APE {
class Tag;
}
//! An implementation of WavPack metadata
//! An implementation of WavPack metadata
/*!
/*!
* 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.
*/
namespace WavPack {
namespace WavPack {
//! An implementation of Strawberry_TagLib::TagLib::File with WavPack specific methods
//! An implementation of Strawberry_TagLib::TagLib::File with WavPack specific methods
/*!
/*!
* This implements and provides an interface for WavPack files to the
* Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
* the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
* information specific to WavPack files.
*/
class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
public:
/*!
* This set of flags is used for various operations and is suitable for
* being OR-ed together.
*/
enum TagTypes {
//! Empty set. Matches no tag types.
NoTags = 0x0000,
//! Matches ID3v1 tags.
ID3v1 = 0x0001,
//! Matches APE tags.
APE = 0x0002,
//! Matches all tag types.
AllTags = 0xffff
};
enum TagTypes {
//! Empty set. Matches no tag types.
NoTags = 0x0000,
//! Matches ID3v1 tags.
ID3v1 = 0x0001,
//! Matches APE tags.
APE = 0x0002,
//! Matches all tag types.
AllTags = 0xffff
};
/*!
/*!
* Constructs a WavPack file from \a file. If \a readProperties is true the
* file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored
*/
File(FileName file, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
File(FileName file, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
/*!
/*!
* Constructs an WavPack file from \a file. If \a readProperties is true the
* file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored.
@@ -96,50 +99,50 @@ namespace TagLib {
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
*/
File(IOStream *stream, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
File(IOStream *stream, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
/*!
/*!
* Destroys this instance of the File.
*/
virtual ~File();
virtual ~File();
/*!
/*!
* Returns the Tag for this file. This will be an APE tag, an ID3v1 tag
* or a combination of the two.
*/
virtual Strawberry_TagLib::TagLib::Tag *tag() const;
virtual Strawberry_TagLib::TagLib::Tag *tag() const;
/*!
/*!
* Implements the unified property interface -- export function.
* If the file contains both an APE and an ID3v1 tag, only APE
* will be converted to the PropertyMap.
*/
PropertyMap properties() const;
PropertyMap properties() const;
void removeUnsupportedProperties(const StringList &properties);
void removeUnsupportedProperties(const StringList &properties);
/*!
/*!
* Implements the unified property interface -- import function.
* Creates an APE tag if it does not exists and calls setProperties() on
* that. Any existing ID3v1 tag will be updated as well.
*/
PropertyMap setProperties(const PropertyMap&);
PropertyMap setProperties(const PropertyMap &);
/*!
/*!
* Returns the MPC::Properties for this file. If no audio properties
* were read then this will return a null pointer.
*/
virtual Properties *audioProperties() const;
virtual Properties *audioProperties() const;
/*!
/*!
* Saves the file.
*
* This returns true if the save was successful.
*/
virtual bool save();
virtual bool save();
/*!
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
* If \a create is false (the default) this may return a null pointer
@@ -156,9 +159,9 @@ namespace TagLib {
*
* \see hasID3v1Tag()
*/
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 may return a null pointer
@@ -175,9 +178,9 @@ namespace TagLib {
*
* \see hasAPETag()
*/
APE::Tag *APETag(bool create = false);
APE::Tag *APETag(bool create = false);
/*!
/*!
* This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags.
*
@@ -185,41 +188,41 @@ namespace TagLib {
* as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called
*/
void strip(int tags = AllTags);
void strip(int tags = AllTags);
/*!
/*!
* Returns whether or not the file on disk actually has an ID3v1 tag.
*
* \see ID3v1Tag()
*/
bool hasID3v1Tag() const;
bool hasID3v1Tag() const;
/*!
/*!
* Returns whether or not the file on disk actually has an APE tag.
*
* \see APETag()
*/
bool hasAPETag() const;
bool hasAPETag() const;
/*!
/*!
* Check if the given \a stream can be opened as a WavPack file.
*
* \note This method is designed to do a quick check. The result may
* not necessarily be correct.
*/
static bool isSupported(IOStream *stream);
static bool isSupported(IOStream *stream);
private:
File(const File &);
File &operator=(const File &);
private:
File(const File &);
File &operator=(const File &);
void read(bool readProperties);
void read(bool readProperties);
class FilePrivate;
FilePrivate *d;
};
}
}
}
class FilePrivate;
FilePrivate *d;
};
} // namespace WavPack
} // namespace TagLib
} // namespace Strawberry_TagLib
#endif

View File

@@ -38,18 +38,16 @@
using namespace Strawberry_TagLib::TagLib;
class WavPack::Properties::PropertiesPrivate
{
public:
PropertiesPrivate() :
length(0),
bitrate(0),
sampleRate(0),
channels(0),
version(0),
bitsPerSample(0),
lossless(false),
sampleFrames(0) {}
class WavPack::Properties::PropertiesPrivate {
public:
PropertiesPrivate() : length(0),
bitrate(0),
sampleRate(0),
channels(0),
version(0),
bitsPerSample(0),
lossless(false),
sampleFrames(0) {}
int length;
int bitrate;
@@ -65,72 +63,57 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
WavPack::Properties::Properties(const ByteVector &, long, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
WavPack::Properties::Properties(const ByteVector &, long, ReadStyle style) : AudioProperties(style),
d(new PropertiesPrivate()) {
debug("WavPack::Properties::Properties() -- This constructor is no longer used.");
}
WavPack::Properties::Properties(File *file, long streamLength, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
WavPack::Properties::Properties(File *file, long streamLength, ReadStyle style) : AudioProperties(style),
d(new PropertiesPrivate()) {
read(file, streamLength);
}
WavPack::Properties::~Properties()
{
WavPack::Properties::~Properties() {
delete d;
}
int WavPack::Properties::length() const
{
int WavPack::Properties::length() const {
return lengthInSeconds();
}
int WavPack::Properties::lengthInSeconds() const
{
int WavPack::Properties::lengthInSeconds() const {
return d->length / 1000;
}
int WavPack::Properties::lengthInMilliseconds() const
{
int WavPack::Properties::lengthInMilliseconds() const {
return d->length;
}
int WavPack::Properties::bitrate() const
{
int WavPack::Properties::bitrate() const {
return d->bitrate;
}
int WavPack::Properties::sampleRate() const
{
int WavPack::Properties::sampleRate() const {
return d->sampleRate;
}
int WavPack::Properties::channels() const
{
int WavPack::Properties::channels() const {
return d->channels;
}
int WavPack::Properties::version() const
{
int WavPack::Properties::version() const {
return d->version;
}
int WavPack::Properties::bitsPerSample() const
{
int WavPack::Properties::bitsPerSample() const {
return d->bitsPerSample;
}
bool WavPack::Properties::isLossless() const
{
bool WavPack::Properties::isLossless() const {
return d->lossless;
}
unsigned int WavPack::Properties::sampleFrames() const
{
unsigned int WavPack::Properties::sampleFrames() const {
return d->sampleFrames;
}
@@ -138,98 +121,96 @@ unsigned int WavPack::Properties::sampleFrames() const
// private members
////////////////////////////////////////////////////////////////////////////////
namespace
{
const unsigned int sample_rates[] = {
6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
32000, 44100, 48000, 64000, 88200, 96000, 192000, 0 };
namespace {
const unsigned int sample_rates[] = {
6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
32000, 44100, 48000, 64000, 88200, 96000, 192000, 0
};
}
#define BYTES_STORED 3
#define MONO_FLAG 4
#define LOSSLESS_FLAG 8
#define BYTES_STORED 3
#define MONO_FLAG 4
#define LOSSLESS_FLAG 8
#define SHIFT_LSB 13
#define SHIFT_MASK (0x1fL << SHIFT_LSB)
#define SHIFT_LSB 13
#define SHIFT_MASK (0x1fL << SHIFT_LSB)
#define SRATE_LSB 23
#define SRATE_MASK (0xfL << SRATE_LSB)
#define SRATE_LSB 23
#define SRATE_MASK (0xfL << SRATE_LSB)
#define MIN_STREAM_VERS 0x402
#define MAX_STREAM_VERS 0x410
#define FINAL_BLOCK 0x1000
#define FINAL_BLOCK 0x1000
void WavPack::Properties::read(File *file, long streamLength)
{
void WavPack::Properties::read(File *file, long streamLength) {
long offset = 0;
while(true) {
while (true) {
file->seek(offset);
const ByteVector data = file->readBlock(32);
if(data.size() < 32) {
if (data.size() < 32) {
debug("WavPack::Properties::read() -- data is too short.");
break;
}
if(!data.startsWith("wvpk")) {
if (!data.startsWith("wvpk")) {
debug("WavPack::Properties::read() -- Block header not found.");
break;
}
const unsigned int flags = data.toUInt(24, false);
if(offset == 0) {
if (offset == 0) {
d->version = data.toShort(8, false);
if(d->version < MIN_STREAM_VERS || d->version > MAX_STREAM_VERS)
if (d->version < MIN_STREAM_VERS || d->version > MAX_STREAM_VERS)
break;
d->bitsPerSample = ((flags & BYTES_STORED) + 1) * 8 - ((flags & SHIFT_MASK) >> SHIFT_LSB);
d->sampleRate = sample_rates[(flags & SRATE_MASK) >> SRATE_LSB];
d->lossless = !(flags & LOSSLESS_FLAG);
d->sampleFrames = data.toUInt(12, false);
d->sampleRate = sample_rates[(flags & SRATE_MASK) >> SRATE_LSB];
d->lossless = !(flags & LOSSLESS_FLAG);
d->sampleFrames = data.toUInt(12, false);
}
d->channels += (flags & MONO_FLAG) ? 1 : 2;
if(flags & FINAL_BLOCK)
if (flags & FINAL_BLOCK)
break;
const unsigned int blockSize = data.toUInt(4, false);
offset += blockSize + 8;
}
if(d->sampleFrames == ~0u)
if (d->sampleFrames == ~0u)
d->sampleFrames = seekFinalIndex(file, streamLength);
if(d->sampleFrames > 0 && d->sampleRate > 0) {
if (d->sampleFrames > 0 && d->sampleRate > 0) {
const double length = d->sampleFrames * 1000.0 / d->sampleRate;
d->length = static_cast<int>(length + 0.5);
d->length = static_cast<int>(length + 0.5);
d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
}
}
unsigned int WavPack::Properties::seekFinalIndex(File *file, long streamLength)
{
unsigned int WavPack::Properties::seekFinalIndex(File *file, long streamLength) {
const long offset = file->rfind("wvpk", streamLength);
if(offset == -1)
if (offset == -1)
return 0;
file->seek(offset);
const ByteVector data = file->readBlock(32);
if(data.size() < 32)
if (data.size() < 32)
return 0;
const int version = data.toShort(8, false);
if(version < MIN_STREAM_VERS || version > MAX_STREAM_VERS)
if (version < MIN_STREAM_VERS || version > MAX_STREAM_VERS)
return 0;
const unsigned int flags = data.toUInt(24, false);
if(!(flags & FINAL_BLOCK))
if (!(flags & FINAL_BLOCK))
return 0;
const unsigned int blockIndex = data.toUInt(16, false);
const unsigned int blockIndex = data.toUInt(16, false);
const unsigned int blockSamples = data.toUInt(20, false);
return blockIndex + blockSamples;

View File

@@ -36,43 +36,42 @@
namespace Strawberry_TagLib {
namespace TagLib {
namespace WavPack {
namespace WavPack {
class File;
class File;
static const unsigned int HeaderSize = 32;
static const unsigned int HeaderSize = 32;
//! An implementation of audio property reading for WavPack
//! An implementation of audio property reading for WavPack
/*!
/*!
* This reads the data from an WavPack stream found in the AudioProperties
* API.
*/
class TAGLIB_EXPORT Properties : public AudioProperties
{
public:
/*!
class TAGLIB_EXPORT Properties : public AudioProperties {
public:
/*!
* Create an instance of WavPack::Properties with the data read from the
* ByteVector \a data.
*
* \deprecated This constructor will be dropped in favor of the one below
* in a future version.
*/
TAGLIB_DEPRECATED Properties(const ByteVector &data, long streamLength,
ReadStyle style = Average);
TAGLIB_DEPRECATED Properties(const ByteVector &data, long streamLength,
ReadStyle style = Average);
/*!
/*!
* Create an instance of WavPack::Properties.
*/
Properties(File *file, long streamLength, ReadStyle style = Average);
Properties(File *file, long streamLength, ReadStyle style = Average);
/*!
/*!
* Destroys this WavPack::Properties instance.
*/
virtual ~Properties();
virtual ~Properties();
/*!
/*!
* Returns the length of the file in seconds. The length is rounded down to
* the nearest whole second.
*
@@ -80,72 +79,72 @@ namespace TagLib {
*
* \deprecated
*/
TAGLIB_DEPRECATED virtual int length() const;
TAGLIB_DEPRECATED virtual int length() const;
/*!
/*!
* Returns the length of the file in seconds. The length is rounded down to
* the nearest whole second.
*
* \see lengthInMilliseconds()
*/
// BIC: make virtual
int lengthInSeconds() const;
// BIC: make virtual
int lengthInSeconds() const;
/*!
/*!
* Returns the length of the file in milliseconds.
*
* \see lengthInSeconds()
*/
// BIC: make virtual
int lengthInMilliseconds() const;
// BIC: make virtual
int lengthInMilliseconds() const;
/*!
/*!
* Returns the average bit rate of the file in kb/s.
*/
virtual int bitrate() const;
virtual int bitrate() const;
/*!
/*!
* Returns the sample rate in Hz. 0 means unknown or custom.
*/
virtual int sampleRate() const;
virtual int sampleRate() const;
/*!
/*!
* Returns the number of audio channels.
*/
virtual int channels() const;
virtual int channels() const;
/*!
/*!
* Returns the number of bits per audio sample.
*/
int bitsPerSample() const;
int bitsPerSample() const;
/*!
/*!
* Returns whether or not the file is lossless encoded.
*/
bool isLossless() const;
bool isLossless() const;
/*!
/*!
* Returns the total number of audio samples in file.
*/
unsigned int sampleFrames() const;
unsigned int sampleFrames() const;
/*!
/*!
* Returns WavPack version.
*/
int version() const;
int version() const;
private:
Properties(const Properties &);
Properties &operator=(const Properties &);
private:
Properties(const Properties &);
Properties &operator=(const Properties &);
void read(File *file, long streamLength);
unsigned int seekFinalIndex(File *file, long streamLength);
void read(File *file, long streamLength);
unsigned int seekFinalIndex(File *file, long streamLength);
class PropertiesPrivate;
PropertiesPrivate *d;
};
}
}
}
class PropertiesPrivate;
PropertiesPrivate *d;
};
} // namespace WavPack
} // namespace TagLib
} // namespace Strawberry_TagLib
#endif