mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-16 22:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changed names of derived classes of AudioProperties

Browse Source
This commit is contained in:
Tsuda Kageyu
2013-05-06 19:23:57 +09:00
parent 72bb1a887e
commit 4ce7ebe520
77 changed files with 578 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
taglib/xm/xmfile.cpp
View File

@ -360,7 +360,7 @@ public:
}
Mod::Tag tag;
XM::Properties properties;
XM::AudioProperties properties;
};
XM::File::File(FileName file, bool readProperties,
@ -391,7 +391,7 @@ Mod::Tag *XM::File::tag() const
return &d->tag;
}
XM::Properties *XM::File::audioProperties() const
XM::AudioProperties *XM::File::audioProperties() const
{
return &d->properties;
}

2
taglib/xm/xmfile.h
View File

@ -67,7 +67,7 @@ namespace TagLib {
* Returns the XM::Properties for this file. If no audio properties
* were read then this will return a null pointer.
*/
XM::Properties *audioProperties() const;
XM::AudioProperties *audioProperties() const;
/*!
* Save the file.

56
taglib/xm/xmproperties.cpp
View File

@ -24,7 +24,7 @@
using namespace TagLib;
using namespace XM;
class XM::Properties::PropertiesPrivate
class XM::AudioProperties::PropertiesPrivate
{
public:
PropertiesPrivate() :
@ -53,128 +53,128 @@ public:
ushort bpmSpeed;
};
XM::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
AudioProperties(propertiesStyle),
d(new PropertiesPrivate)
XM::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle)
: TagLib::AudioProperties(propertiesStyle)
, d(new PropertiesPrivate)
{
}
XM::Properties::~Properties()
XM::AudioProperties::~AudioProperties()
{
delete d;
}
int XM::Properties::length() const
int XM::AudioProperties::length() const
{
return 0;
}
int XM::Properties::bitrate() const
int XM::AudioProperties::bitrate() const
{
return 0;
}
int XM::Properties::sampleRate() const
int XM::AudioProperties::sampleRate() const
{
return 0;
}
int XM::Properties::channels() const
int XM::AudioProperties::channels() const
{
return d->channels;
}
TagLib::ushort XM::Properties::lengthInPatterns() const
TagLib::ushort XM::AudioProperties::lengthInPatterns() const
{
return d->lengthInPatterns;
}
TagLib::ushort XM::Properties::version() const
TagLib::ushort XM::AudioProperties::version() const
{
return d->version;
}
TagLib::ushort XM::Properties::restartPosition() const
TagLib::ushort XM::AudioProperties::restartPosition() const
{
return d->restartPosition;
}
TagLib::ushort XM::Properties::patternCount() const
TagLib::ushort XM::AudioProperties::patternCount() const
{
return d->patternCount;
}
TagLib::ushort XM::Properties::instrumentCount() const
TagLib::ushort XM::AudioProperties::instrumentCount() const
{
return d->instrumentCount;
}
TagLib::uint XM::Properties::sampleCount() const
TagLib::uint XM::AudioProperties::sampleCount() const
{
return d->sampleCount;
}
TagLib::ushort XM::Properties::flags() const
TagLib::ushort XM::AudioProperties::flags() const
{
return d->flags;
}
TagLib::ushort XM::Properties::tempo() const
TagLib::ushort XM::AudioProperties::tempo() const
{
return d->tempo;
}
TagLib::ushort XM::Properties::bpmSpeed() const
TagLib::ushort XM::AudioProperties::bpmSpeed() const
{
return d->bpmSpeed;
}
void XM::Properties::setLengthInPatterns(ushort lengthInPatterns)
void XM::AudioProperties::setLengthInPatterns(ushort lengthInPatterns)
{
d->lengthInPatterns = lengthInPatterns;
}
void XM::Properties::setChannels(int channels)
void XM::AudioProperties::setChannels(int channels)
{
d->channels = channels;
}
void XM::Properties::setVersion(ushort version)
void XM::AudioProperties::setVersion(ushort version)
{
d->version = version;
}
void XM::Properties::setRestartPosition(ushort restartPosition)
void XM::AudioProperties::setRestartPosition(ushort restartPosition)
{
d->restartPosition = restartPosition;
}
void XM::Properties::setPatternCount(ushort patternCount)
void XM::AudioProperties::setPatternCount(ushort patternCount)
{
d->patternCount = patternCount;
}
void XM::Properties::setInstrumentCount(ushort instrumentCount)
void XM::AudioProperties::setInstrumentCount(ushort instrumentCount)
{
d->instrumentCount = instrumentCount;
}
void XM::Properties::setSampleCount(uint sampleCount)
void XM::AudioProperties::setSampleCount(uint sampleCount)
{
d->sampleCount = sampleCount;
}
void XM::Properties::setFlags(ushort flags)
void XM::AudioProperties::setFlags(ushort flags)
{
d->flags = flags;
}
void XM::Properties::setTempo(ushort tempo)
void XM::AudioProperties::setTempo(ushort tempo)
{
d->tempo = tempo;
}
void XM::Properties::setBpmSpeed(ushort bpmSpeed)
void XM::AudioProperties::setBpmSpeed(ushort bpmSpeed)
{
d->bpmSpeed = bpmSpeed;
}

10
taglib/xm/xmproperties.h
View File

@ -28,7 +28,7 @@
namespace TagLib {
namespace XM {
class Properties : public AudioProperties {
class AudioProperties : public TagLib::AudioProperties {
friend class File;
public:
/*! Flag bits. */
@ -36,8 +36,8 @@ namespace TagLib {
LinearFreqTable = 1 // otherwise its the amiga freq. table
};
Properties(AudioProperties::ReadStyle propertiesStyle);
virtual ~Properties();
AudioProperties(AudioProperties::ReadStyle propertiesStyle);
virtual ~AudioProperties();
int length() const;
int bitrate() const;
@ -67,8 +67,8 @@ namespace TagLib {
void setBpmSpeed(ushort bpmSpeed);
private:
Properties(const Properties&);
Properties &operator=(const Properties&);
AudioProperties(const AudioProperties&);
AudioProperties &operator=(const AudioProperties&);
class PropertiesPrivate;
PropertiesPrivate *d;