taglib: Rename Properties to AudioProperties

3rdparty/taglib/s3m/s3mfile.cpp

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

3rdparty/taglib/s3m/s3mfile.h

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

3rdparty/taglib/s3m/s3mproperties.cpp

@@ -29,9 +29,9 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace S3M;
 
-class S3M::Properties::PropertiesPrivate {
+class S3M::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() : lengthInPatterns(0),
+  AudioPropertiesPrivate() : lengthInPatterns(0),
                         channels(0),
                         stereo(false),
                         sampleCount(0),
@@ -59,124 +59,120 @@ class S3M::Properties::PropertiesPrivate {
   unsigned char bpmSpeed;
 };
 
-S3M::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) : AudioProperties(propertiesStyle), d(new PropertiesPrivate()) {}
+S3M::AudioProperties::AudioProperties(AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::AudioProperties(propertiesStyle), d(new AudioPropertiesPrivate()) {}
 
-S3M::Properties::~Properties() {
+S3M::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int S3M::Properties::length() const {
+int S3M::AudioProperties::lengthInSeconds() const {
   return 0;
 }
 
-int S3M::Properties::lengthInSeconds() const {
+int S3M::AudioProperties::lengthInMilliseconds() const {
   return 0;
 }
 
-int S3M::Properties::lengthInMilliseconds() const {
+int S3M::AudioProperties::bitrate() const {
   return 0;
 }
 
-int S3M::Properties::bitrate() const {
+int S3M::AudioProperties::sampleRate() const {
   return 0;
 }
 
-int S3M::Properties::sampleRate() const {
-  return 0;
-}
-
-int S3M::Properties::channels() const {
+int S3M::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned short S3M::Properties::lengthInPatterns() const {
+unsigned short S3M::AudioProperties::lengthInPatterns() const {
   return d->lengthInPatterns;
 }
 
-bool S3M::Properties::stereo() const {
+bool S3M::AudioProperties::stereo() const {
   return d->stereo;
 }
 
-unsigned short S3M::Properties::sampleCount() const {
+unsigned short S3M::AudioProperties::sampleCount() const {
   return d->sampleCount;
 }
 
-unsigned short S3M::Properties::patternCount() const {
+unsigned short S3M::AudioProperties::patternCount() const {
   return d->patternCount;
 }
 
-unsigned short S3M::Properties::flags() const {
+unsigned short S3M::AudioProperties::flags() const {
   return d->flags;
 }
 
-unsigned short S3M::Properties::trackerVersion() const {
+unsigned short S3M::AudioProperties::trackerVersion() const {
   return d->trackerVersion;
 }
 
-unsigned short S3M::Properties::fileFormatVersion() const {
+unsigned short S3M::AudioProperties::fileFormatVersion() const {
   return d->fileFormatVersion;
 }
 
-unsigned char S3M::Properties::globalVolume() const {
+unsigned char S3M::AudioProperties::globalVolume() const {
   return d->globalVolume;
 }
 
-unsigned char S3M::Properties::masterVolume() const {
+unsigned char S3M::AudioProperties::masterVolume() const {
   return d->masterVolume;
 }
 
-unsigned char S3M::Properties::tempo() const {
+unsigned char S3M::AudioProperties::tempo() const {
   return d->tempo;
 }
 
-unsigned char S3M::Properties::bpmSpeed() const {
+unsigned char S3M::AudioProperties::bpmSpeed() const {
   return d->bpmSpeed;
 }
 
-void S3M::Properties::setLengthInPatterns(unsigned short lengthInPatterns) {
+void S3M::AudioProperties::setLengthInPatterns(unsigned short lengthInPatterns) {
   d->lengthInPatterns = lengthInPatterns;
 }
 
-void S3M::Properties::setChannels(int channels) {
+void S3M::AudioProperties::setChannels(int channels) {
   d->channels = channels;
 }
 
-void S3M::Properties::setStereo(bool stereo) {
+void S3M::AudioProperties::setStereo(bool stereo) {
   d->stereo = stereo;
 }
 
-void S3M::Properties::setSampleCount(unsigned short sampleCount) {
+void S3M::AudioProperties::setSampleCount(unsigned short sampleCount) {
   d->sampleCount = sampleCount;
 }
 
-void S3M::Properties::setPatternCount(unsigned short patternCount) {
+void S3M::AudioProperties::setPatternCount(unsigned short patternCount) {
   d->patternCount = patternCount;
 }
 
-void S3M::Properties::setFlags(unsigned short flags) {
+void S3M::AudioProperties::setFlags(unsigned short flags) {
   d->flags = flags;
 }
 
-void S3M::Properties::setTrackerVersion(unsigned short trackerVersion) {
+void S3M::AudioProperties::setTrackerVersion(unsigned short trackerVersion) {
   d->trackerVersion = trackerVersion;
 }
 
-void S3M::Properties::setFileFormatVersion(unsigned short fileFormatVersion) {
+void S3M::AudioProperties::setFileFormatVersion(unsigned short fileFormatVersion) {
   d->fileFormatVersion = fileFormatVersion;
 }
 
-void S3M::Properties::setGlobalVolume(unsigned char globalVolume) {
+void S3M::AudioProperties::setGlobalVolume(unsigned char globalVolume) {
   d->globalVolume = globalVolume;
 }
 
-void S3M::Properties::setMasterVolume(unsigned char masterVolume) {
+void S3M::AudioProperties::setMasterVolume(unsigned char masterVolume) {
   d->masterVolume = masterVolume;
 }
 
-void S3M::Properties::setTempo(unsigned char tempo) {
+void S3M::AudioProperties::setTempo(unsigned char tempo) {
   d->tempo = tempo;
 }
 
-void S3M::Properties::setBpmSpeed(unsigned char bpmSpeed) {
+void S3M::AudioProperties::setBpmSpeed(unsigned char bpmSpeed) {
   d->bpmSpeed = bpmSpeed;
 }

3rdparty/taglib/s3m/s3mproperties.h

@@ -33,7 +33,7 @@ namespace Strawberry_TagLib {
 namespace TagLib {
 namespace S3M {
 
-class TAGLIB_EXPORT Properties : public AudioProperties {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
   friend class File;
 
  public:
@@ -48,10 +48,9 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
     CustomData = 128
   };
 
-  Properties(AudioProperties::ReadStyle propertiesStyle);
-  virtual ~Properties();
+  AudioProperties(AudioProperties::ReadStyle propertiesStyle);
+  virtual ~AudioProperties();
 
-  int length() const;
   int lengthInSeconds() const;
   int lengthInMilliseconds() const;
   int bitrate() const;
@@ -85,11 +84,11 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
   void setBpmSpeed(unsigned char 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 S3M