diff --git a/taglib/shn/shnfile.cpp b/taglib/shn/shnfile.cpp index 04e98116..ffb54b6e 100644 --- a/taglib/shn/shnfile.cpp +++ b/taglib/shn/shnfile.cpp @@ -275,14 +275,14 @@ void SHN::File::read(AudioProperties::ReadStyle propertiesStyle) // Set up variable length input VariableLengthInput input{this}; - // Read internal file type - uint32_t internalFileType; - if(!input.getUInt(internalFileType, version, fileTypeCodeSize)) { - debug("SHN::File::read() -- Unable to read internal file type."); + // Read file type + uint32_t fileType; + if(!input.getUInt(fileType, version, fileTypeCodeSize)) { + debug("SHN::File::read() -- Unable to read file type."); setValid(false); return; } - props.internalFileType = static_cast(internalFileType); + props.fileType = static_cast(fileType); // Read number of channels uint32_t channelCount = 0; diff --git a/taglib/shn/shnproperties.cpp b/taglib/shn/shnproperties.cpp index d1dfe20c..3e47793e 100644 --- a/taglib/shn/shnproperties.cpp +++ b/taglib/shn/shnproperties.cpp @@ -40,7 +40,7 @@ public: PropertiesPrivate &operator=(const PropertiesPrivate &) = delete; int version { 0 }; - int internalFileType { 0 }; + int fileType { 0 }; int channelCount { 0 }; int sampleRate { 0 }; int bitsPerSample { 0 }; @@ -57,7 +57,7 @@ SHN::Properties::Properties(const PropertyValues *values, ReadStyle style) : { if(values) { d->version = values->version; - d->internalFileType = values->internalFileType; + d->fileType = values->fileType; d->channelCount = values->channelCount; d->sampleRate = values->sampleRate; d->bitsPerSample = values->bitsPerSample; @@ -96,9 +96,9 @@ int SHN::Properties::shortenVersion() const return d->version; } -int SHN::Properties::internalFileType() const +int SHN::Properties::fileType() const { - return d->internalFileType; + return d->fileType; } int SHN::Properties::bitsPerSample() const diff --git a/taglib/shn/shnproperties.h b/taglib/shn/shnproperties.h index b523208f..493c654d 100644 --- a/taglib/shn/shnproperties.h +++ b/taglib/shn/shnproperties.h @@ -52,8 +52,8 @@ namespace TagLib { //! Returns the Shorten file version (1-3). int shortenVersion() const; - //! Returns the Shorten internal file type. - int internalFileType() const; + //! Returns the Shorten file type. + int fileType() const; int bitsPerSample() const; unsigned long sampleFrames() const; diff --git a/taglib/shn/shnutils.h b/taglib/shn/shnutils.h index 48ca1d94..25fffd82 100644 --- a/taglib/shn/shnutils.h +++ b/taglib/shn/shnutils.h @@ -33,7 +33,7 @@ namespace TagLib { struct PropertyValues { int version { 0 }; - int internalFileType { 0 }; + int fileType { 0 }; int channelCount { 0 }; int sampleRate { 0 }; int bitsPerSample { 0 }; diff --git a/tests/test_shn.cpp b/tests/test_shn.cpp index c0fafb7a..0857213f 100644 --- a/tests/test_shn.cpp +++ b/tests/test_shn.cpp @@ -31,7 +31,7 @@ public: CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->channels()); CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate()); CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->shortenVersion()); - CPPUNIT_ASSERT_EQUAL(5, f.audioProperties()->internalFileType()); + CPPUNIT_ASSERT_EQUAL(5, f.audioProperties()->fileType()); CPPUNIT_ASSERT_EQUAL(16, f.audioProperties()->bitsPerSample()); CPPUNIT_ASSERT_EQUAL(static_cast(88200), f.audioProperties()->sampleFrames()); }