Refactored AudioProperties classes in some ways

This commit is contained in:
Tsuda Kageyu
2013-07-13 10:38:52 +09:00
parent 6d89689c0e
commit 6d40cbc04f
44 changed files with 498 additions and 477 deletions

View File

@ -39,9 +39,7 @@ public:
globalVolume(0),
masterVolume(0),
tempo(0),
bpmSpeed(0)
{
}
bpmSpeed(0) {}
ushort lengthInPatterns;
int channels;
@ -57,9 +55,12 @@ public:
uchar bpmSpeed;
};
S3M::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle)
: TagLib::AudioProperties(propertiesStyle)
, d(new PropertiesPrivate)
////////////////////////////////////////////////////////////////////////////////
// public members
////////////////////////////////////////////////////////////////////////////////
S3M::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle) :
d(new PropertiesPrivate())
{
}
@ -143,6 +144,10 @@ uchar S3M::AudioProperties::bpmSpeed() const
return d->bpmSpeed;
}
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
void S3M::AudioProperties::setLengthInPatterns(ushort lengthInPatterns)
{
d->lengthInPatterns = lengthInPatterns;

View File

@ -26,9 +26,15 @@
#include "audioproperties.h"
namespace TagLib {
namespace S3M {
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties {
class File;
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties
{
friend class File;
public:
/*! Flag bits. */
enum {
@ -61,6 +67,7 @@ namespace TagLib {
uchar tempo() const;
uchar bpmSpeed() const;
private:
void setChannels(int channels);
void setLengthInPatterns (ushort lengthInPatterns);
@ -75,10 +82,6 @@ namespace TagLib {
void setTempo (uchar tempo);
void setBpmSpeed (uchar bpmSpeed);
private:
AudioProperties(const AudioProperties&);
AudioProperties &operator=(const AudioProperties&);
class PropertiesPrivate;
PropertiesPrivate *d;
};