taglib: Rename Properties to AudioProperties

3rdparty/taglib/xm/xmfile.cpp

@@ -307,7 +307,7 @@ class XM::File::FilePrivate {
   explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
   Mod::Tag tag;
-  XM::Properties properties;
+  XM::AudioProperties properties;
 };
 
 XM::File::File(FileName file, bool readProperties,
@@ -340,7 +340,7 @@ PropertyMap XM::File::setProperties(const PropertyMap &properties) {
   return d->tag.setProperties(properties);
 }
 
-XM::Properties *XM::File::audioProperties() const {
+XM::AudioProperties *XM::File::audioProperties() const {
   return &d->properties;
 }
 

3rdparty/taglib/xm/xmfile.h

@@ -77,10 +77,10 @@ class TAGLIB_EXPORT File : public Mod::FileBase {
   PropertyMap setProperties(const PropertyMap &);
 
   /*!
-   * Returns the XM::Properties for this file.
+   * Returns the XM::AudioProperties 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.

3rdparty/taglib/xm/xmproperties.cpp

@@ -29,9 +29,9 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace XM;
 
-class XM::Properties::PropertiesPrivate {
+class XM::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() : lengthInPatterns(0),
+  AudioPropertiesPrivate() : lengthInPatterns(0),
                         channels(0),
                         version(0),
                         restartPosition(0),
@@ -55,108 +55,104 @@ class XM::Properties::PropertiesPrivate {
   unsigned short bpmSpeed;
 };
 
-XM::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) : AudioProperties(propertiesStyle), d(new PropertiesPrivate()) {}
+XM::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::AudioProperties(propertiesStyle), d(new AudioPropertiesPrivate()) {}
 
-XM::Properties::~Properties() {
+XM::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int XM::Properties::length() const {
+int XM::AudioProperties::lengthInSeconds() const {
   return 0;
 }
 
-int XM::Properties::lengthInSeconds() const {
+int XM::AudioProperties::lengthInMilliseconds() const {
   return 0;
 }
 
-int XM::Properties::lengthInMilliseconds() const {
+int XM::AudioProperties::bitrate() const {
   return 0;
 }
 
-int XM::Properties::bitrate() const {
+int XM::AudioProperties::sampleRate() const {
   return 0;
 }
 
-int XM::Properties::sampleRate() const {
-  return 0;
-}
-
-int XM::Properties::channels() const {
+int XM::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned short XM::Properties::lengthInPatterns() const {
+unsigned short XM::AudioProperties::lengthInPatterns() const {
   return d->lengthInPatterns;
 }
 
-unsigned short XM::Properties::version() const {
+unsigned short XM::AudioProperties::version() const {
   return d->version;
 }
 
-unsigned short XM::Properties::restartPosition() const {
+unsigned short XM::AudioProperties::restartPosition() const {
   return d->restartPosition;
 }
 
-unsigned short XM::Properties::patternCount() const {
+unsigned short XM::AudioProperties::patternCount() const {
   return d->patternCount;
 }
 
-unsigned short XM::Properties::instrumentCount() const {
+unsigned short XM::AudioProperties::instrumentCount() const {
   return d->instrumentCount;
 }
 
-unsigned int XM::Properties::sampleCount() const {
+unsigned int XM::AudioProperties::sampleCount() const {
   return d->sampleCount;
 }
 
-unsigned short XM::Properties::flags() const {
+unsigned short XM::AudioProperties::flags() const {
   return d->flags;
 }
 
-unsigned short XM::Properties::tempo() const {
+unsigned short XM::AudioProperties::tempo() const {
   return d->tempo;
 }
 
-unsigned short XM::Properties::bpmSpeed() const {
+unsigned short XM::AudioProperties::bpmSpeed() const {
   return d->bpmSpeed;
 }
 
-void XM::Properties::setLengthInPatterns(unsigned short lengthInPatterns) {
+void XM::AudioProperties::setLengthInPatterns(unsigned short lengthInPatterns) {
   d->lengthInPatterns = lengthInPatterns;
 }
 
-void XM::Properties::setChannels(int channels) {
+void XM::AudioProperties::setChannels(int channels) {
   d->channels = channels;
 }
 
-void XM::Properties::setVersion(unsigned short version) {
+void XM::AudioProperties::setVersion(unsigned short version) {
   d->version = version;
 }
 
-void XM::Properties::setRestartPosition(unsigned short restartPosition) {
+void XM::AudioProperties::setRestartPosition(unsigned short restartPosition) {
   d->restartPosition = restartPosition;
 }
 
-void XM::Properties::setPatternCount(unsigned short patternCount) {
+void XM::AudioProperties::setPatternCount(unsigned short patternCount) {
   d->patternCount = patternCount;
 }
 
-void XM::Properties::setInstrumentCount(unsigned short instrumentCount) {
+void XM::AudioProperties::setInstrumentCount(unsigned short instrumentCount) {
   d->instrumentCount = instrumentCount;
 }
 
-void XM::Properties::setSampleCount(unsigned int sampleCount) {
+void XM::AudioProperties::setSampleCount(unsigned int sampleCount) {
   d->sampleCount = sampleCount;
 }
 
-void XM::Properties::setFlags(unsigned short flags) {
+void XM::AudioProperties::setFlags(unsigned short flags) {
   d->flags = flags;
 }
 
-void XM::Properties::setTempo(unsigned short tempo) {
+void XM::AudioProperties::setTempo(unsigned short tempo) {
   d->tempo = tempo;
 }
 
-void XM::Properties::setBpmSpeed(unsigned short bpmSpeed) {
+void XM::AudioProperties::setBpmSpeed(unsigned short bpmSpeed) {
   d->bpmSpeed = bpmSpeed;
 }

3rdparty/taglib/xm/xmproperties.h

@@ -33,7 +33,7 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 namespace XM {
-class TAGLIB_EXPORT Properties : public AudioProperties {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
   friend class File;
 
  public:
@@ -42,10 +42,9 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
     LinearFreqTable = 1  // otherwise its the amiga freq. table
   };
 
-  Properties(AudioProperties::ReadStyle propertiesStyle);
-  virtual ~Properties();
+  AudioProperties(AudioProperties::ReadStyle propertiesStyle);
+  virtual ~AudioProperties();
 
-  int length() const;
   int lengthInSeconds() const;
   int lengthInMilliseconds() const;
   int bitrate() const;
@@ -75,11 +74,11 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
   void setBpmSpeed(unsigned short bpmSpeed);
 
  private:
-  Properties(const Properties &);
-  Properties &operator=(const Properties &);
+  AudioProperties(const AudioProperties &);
+  AudioProperties &operator=(const AudioProperties &);
 
-  class PropertiesPrivate;
-  PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
 
 }  // namespace XM