taglib: Rename Properties to AudioProperties

3rdparty/taglib/mod/modfile.cpp

@@ -38,7 +38,7 @@ class Mod::File::FilePrivate {
   explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
   Mod::Tag tag;
-  Mod::Properties properties;
+  Mod::AudioProperties properties;
 };
 
 Mod::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) {
@@ -63,7 +63,7 @@ Mod::Tag *Mod::File::tag() const {
   return &d->tag;
 }
 
-Mod::Properties *Mod::File::audioProperties() const {
+Mod::AudioProperties *Mod::File::audioProperties() const {
   return &d->properties;
 }
 

3rdparty/taglib/mod/modfile.h

@@ -77,9 +77,9 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::Mod::FileBase {
    */
   PropertyMap setProperties(const PropertyMap &);
   /*!
-   * Returns the Mod::Properties for this file. If no audio properties were read then this will return a null pointer.
+   * Returns the Mod::AudioProperties for this file. If no audio properties were read then this will return a null pointer.
    */
-  Mod::Properties *audioProperties() const;
+  Mod::AudioProperties *audioProperties() const;
 
   /*!
    * Save the file.

3rdparty/taglib/mod/modproperties.cpp

@@ -29,62 +29,58 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-class Mod::Properties::PropertiesPrivate {
+class Mod::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() : channels(0), instrumentCount(0), lengthInPatterns(0) {}
+  AudioPropertiesPrivate() : channels(0), instrumentCount(0), lengthInPatterns(0) {}
 
   int channels;
   unsigned int instrumentCount;
   unsigned char lengthInPatterns;
 };
 
-Mod::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) : AudioProperties(propertiesStyle), d(new PropertiesPrivate()) {
+Mod::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::AudioProperties(propertiesStyle), d(new AudioPropertiesPrivate()) {
 }
 
-Mod::Properties::~Properties() {
+Mod::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int Mod::Properties::length() const {
+int Mod::AudioProperties::lengthInSeconds() const {
   return 0;
 }
 
-int Mod::Properties::lengthInSeconds() const {
+int Mod::AudioProperties::lengthInMilliseconds() const {
   return 0;
 }
 
-int Mod::Properties::lengthInMilliseconds() const {
+int Mod::AudioProperties::bitrate() const {
   return 0;
 }
 
-int Mod::Properties::bitrate() const {
+int Mod::AudioProperties::sampleRate() const {
   return 0;
 }
 
-int Mod::Properties::sampleRate() const {
-  return 0;
-}
-
-int Mod::Properties::channels() const {
+int Mod::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned int Mod::Properties::instrumentCount() const {
+unsigned int Mod::AudioProperties::instrumentCount() const {
   return d->instrumentCount;
 }
 
-unsigned char Mod::Properties::lengthInPatterns() const {
+unsigned char Mod::AudioProperties::lengthInPatterns() const {
   return d->lengthInPatterns;
 }
 
-void Mod::Properties::setChannels(int channels) {
+void Mod::AudioProperties::setChannels(int channels) {
   d->channels = channels;
 }
 
-void Mod::Properties::setInstrumentCount(unsigned int instrumentCount) {
+void Mod::AudioProperties::setInstrumentCount(unsigned int instrumentCount) {
   d->instrumentCount = instrumentCount;
 }
 
-void Mod::Properties::setLengthInPatterns(unsigned char lengthInPatterns) {
+void Mod::AudioProperties::setLengthInPatterns(unsigned char lengthInPatterns) {
   d->lengthInPatterns = lengthInPatterns;
 }

3rdparty/taglib/mod/modproperties.h

@@ -33,12 +33,11 @@ namespace Strawberry_TagLib {
 namespace TagLib {
 namespace Mod {
 
-class TAGLIB_EXPORT Properties : public AudioProperties {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
  public:
-  Properties(AudioProperties::ReadStyle propertiesStyle);
-  virtual ~Properties();
+  AudioProperties(AudioProperties::ReadStyle propertiesStyle);
+  virtual ~AudioProperties();
 
-  int length() const;
   int lengthInSeconds() const;
   int lengthInMilliseconds() const;
   int bitrate() const;
@@ -56,11 +55,11 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
  private:
   friend class File;
 
-  Properties(const Properties &);
-  Properties &operator=(const Properties &);
+  AudioProperties(const AudioProperties &);
+  AudioProperties &operator=(const AudioProperties &);
 
-  class PropertiesPrivate;
-  PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
 
 }  // namespace Mod