mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename DSF::Properties to DSF::AudioProperties

Browse Source
This commit is contained in:
Stephen F. Booth 2013-10-05 13:58:14 -04:00
parent 43240b8ecc
commit b949e23be3
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/dsf/dsffile.cpp
View File

@ -53,7 +53,7 @@ public:
long long fileSize;
long long metadataOffset;
Properties *properties;
AudioProperties *properties;
ID3v2::Tag *tag;
};
@ -62,7 +62,7 @@ public:
////////////////////////////////////////////////////////////////////////////////
DSF::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
AudioProperties::ReadStyle propertiesStyle) : TagLib::File(file)
{
d = new FilePrivate;
if(isOpen())
@ -70,7 +70,7 @@ DSF::File::File(FileName file, bool readProperties,
}
DSF::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
AudioProperties::ReadStyle propertiesStyle) : TagLib::File(stream)
{
d = new FilePrivate;
if(isOpen())
@ -97,7 +97,7 @@ PropertyMap DSF::File::setProperties(const PropertyMap &properties)
return d->tag->setProperties(properties);
}
DSF::Properties *DSF::File::audioProperties() const
DSF::AudioProperties *DSF::File::audioProperties() const
{
return d->properties;
}
@ -145,7 +145,7 @@ bool DSF::File::save()
// private members
////////////////////////////////////////////////////////////////////////////////
void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
void DSF::File::read(bool readProperties, AudioProperties::ReadStyle propertiesStyle)
{
// A DSF file consists of four chunks: DSD chunk, format chunk, data chunk, and metadata chunk
// The file format is not chunked in the sense of a RIFF File, though
@ -183,7 +183,7 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
chunkSize = readBlock(8).toInt64LE(0);
d->properties = new Properties(readBlock(chunkSize), propertiesStyle);
d->properties = new AudioProperties(readBlock(chunkSize), propertiesStyle);
// Skip the data chunk

10
taglib/dsf/dsffile.h
View File

@ -60,7 +60,7 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*/
File(FileName file, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
/*!
* Contructs an DSF file from \a file. If \a readProperties is true the
@ -68,7 +68,7 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*/
File(IOStream *stream, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average);
AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
/*!
* Destroys this instance of the File.
@ -93,10 +93,10 @@ namespace TagLib {
PropertyMap setProperties(const PropertyMap &);
/*!
* Returns the DSF::Properties for this file. If no audio properties
* Returns the DSF::AudioProperties for this file. If no audio properties
* were read then this will return a null pointer.
*/
virtual Properties *audioProperties() const;
virtual AudioProperties *audioProperties() const;
/*!
* Saves the file.
@ -107,7 +107,7 @@ namespace TagLib {
File(const File &);
File &operator=(const File &);
void read(bool readProperties, Properties::ReadStyle propertiesStyle);
void read(bool readProperties, AudioProperties::ReadStyle propertiesStyle);
class FilePrivate;
FilePrivate *d;

28
taglib/dsf/dsfproperties.cpp
View File

@ -30,7 +30,7 @@
using namespace TagLib;
class DSF::Properties::PropertiesPrivate
class DSF::AudioProperties::PropertiesPrivate
{
public:
PropertiesPrivate() :
@ -67,64 +67,64 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
DSF::Properties::Properties(const ByteVector &data, ReadStyle style)
DSF::AudioProperties::AudioProperties(const ByteVector &data, ReadStyle style)
{
d = new PropertiesPrivate;
read(data);
}
DSF::Properties::~Properties()
DSF::AudioProperties::~AudioProperties()
{
delete d;
}
int DSF::Properties::length() const
int DSF::AudioProperties::length() const
{
return d->length;
}
int DSF::Properties::bitrate() const
int DSF::AudioProperties::bitrate() const
{
return d->bitrate;
}
int DSF::Properties::sampleRate() const
int DSF::AudioProperties::sampleRate() const
{
return d->samplingFrequency;
}
int DSF::Properties::channels() const
int DSF::AudioProperties::channels() const
{
return d->channelNum;
}
// DSF specific
int DSF::Properties::formatVersion() const
int DSF::AudioProperties::formatVersion() const
{
return d->formatVersion;
}
int DSF::Properties::formatID() const
int DSF::AudioProperties::formatID() const
{
return d->formatID;
}
int DSF::Properties::channelType() const
int DSF::AudioProperties::channelType() const
{
return d->channelType;
}
int DSF::Properties::bitsPerSample() const
int DSF::AudioProperties::bitsPerSample() const
{
return d->bitsPerSample;
}
long long DSF::Properties::sampleCount() const
long long DSF::AudioProperties::sampleCount() const
{
return d->sampleCount;
}
int DSF::Properties::blockSizePerChannel() const
int DSF::AudioProperties::blockSizePerChannel() const
{
return d->blockSizePerChannel;
}
@ -133,7 +133,7 @@ int DSF::Properties::blockSizePerChannel() const
// private members
////////////////////////////////////////////////////////////////////////////////
void DSF::Properties::read(const ByteVector &data)
void DSF::AudioProperties::read(const ByteVector &data)
{
d->formatVersion = data.mid(0, 4).toUInt32LE(0);
d->formatID = data.mid(4, 4).toUInt32LE(0);

14
taglib/dsf/dsfproperties.h
View File

@ -41,19 +41,19 @@ namespace TagLib {
* API.
*/
class TAGLIB_EXPORT Properties : public AudioProperties
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties
{
public:
/*!
* Create an instance of DSF::Properties with the data read from the
* Create an instance of DSF::AudioProperties with the data read from the
* ByteVector \a data.
*/
Properties(const ByteVector &data, ReadStyle style);
AudioProperties(const ByteVector &data, ReadStyle style);
/*!
* Destroys this AIFF::Properties instance.
* Destroys this DSF::AudioProperties instance.
*/
virtual ~Properties();
virtual ~AudioProperties();
// Reimplementations.
@ -70,8 +70,8 @@ namespace TagLib {
int blockSizePerChannel() const;
private:
Properties(const Properties &);
Properties &operator=(const Properties &);
AudioProperties(const AudioProperties &);
AudioProperties &operator=(const AudioProperties &);
void read(const ByteVector &data);