diff --git a/.editorconfig b/.editorconfig index f16a353f..65b4c19c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ insert_final_newline = true indent_style = space indent_size = 2 -# Trim traling whitespaces +# Trim trailing whitespaces [*.{h,cpp,tcc,cmake,yml}] trim_trailing_whitespace = true diff --git a/INSTALL.md b/INSTALL.md index 4e7d61e9..48c9f6fb 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -65,16 +65,16 @@ Tested with: Requirements: * Tool chain, build environment, whatever ya want to call it ... - Installed and working. -* CMake program. (Available at: www.cmake.org) - Installed and working. + Installed and working. +* CMake program (available at: www.cmake.org). + Installed and working. Optional: -* Zlib library. - Available in some tool chains, not all. - Search the web, take your choice. +* Zlib library. + Available in some tool chains, not all. + Search the web, take your choice. -Useful configuration options used with CMake (GUI and/or command line): + Useful configuration options used with CMake (GUI and/or command line): Any of the `ZLIB_` variables may be used at the command line, `ZLIB_ROOT` is only available on the command line. @@ -83,8 +83,8 @@ Useful configuration options used with CMake (GUI and/or command line): | `WITH_ZLIB=` | Whether to build with ZLib | | `ZLIB_ROOT=` | Where to find ZLib's root directory. Assumes parent of: `\include` and `\lib.`| | `ZLIB_INCLUDE_DIR=` | Where to find ZLib's Include directory.| - | `ZLIB_LIBRARY=` | Where to find ZLib's Library. - | `ZLIB_SOURCE=` | Where to find ZLib's Source Code. Alternative to `ZLIB_INCLUDE_DIR` and `ZLIB_LIBRARY`. + | `ZLIB_LIBRARY=` | Where to find ZLib's Library.| + | `ZLIB_SOURCE=` | Where to find ZLib's Source Code. Alternative to `ZLIB_INCLUDE_DIR` and `ZLIB_LIBRARY`.| | `CMAKE_INSTALL_PREFIX=` | Where to install Taglib. | | `CMAKE_BUILD_TYPE=` | Release, Debug, etc ... (Not available in MSVC) | @@ -128,8 +128,8 @@ The easiest way is at the command prompt (Visual C++ command prompt for MSVS use OR in the MSVS GUI: 1. Open MSVS. 2. Open taglib solution. - 3. Set build type to: Release (look in the tool bars) - 2. Hit F7 to build the solution. (project) + 3. Set build type to: Release (look in the toolbars) + 4. Hit F7 to build the solution. (project) * MinGW: C:\GitRoot\taglib> gmake @@ -138,8 +138,6 @@ The easiest way is at the command prompt (Visual C++ command prompt for MSVS use C:\GitRoot\taglib> mingw32-make - - 3. **Install the project** (Change `install` to `uninstall` to uninstall the project) diff --git a/NEWS b/NEWS index 6ba325fe..b1c25da0 100644 --- a/NEWS +++ b/NEWS @@ -226,7 +226,7 @@ TagLib 1.8 (Sep 6, 2012) * Added support for OWNE ID3 frames. * Changed key validation in the new PropertyMap API. - * ID3v1::Tag::setStringHandler will no londer delete the previous handler, + * ID3v1::Tag::setStringHandler will no longer delete the previous handler, the caller is responsible for this. * File objects will also no longer delete the passed IOStream objects. It should be done in the caller code after the File object is no longer @@ -369,7 +369,7 @@ TagLib 1.6 (Sep 13, 2009) and in String::operator+=. (BUG:169389) * Added support for PRIV ID3v2 frames. * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres. - * Added support for the POPM (rating/playcount) ID3v2 frame. + * Added support for the POPM (rating/play count) ID3v2 frame. * Generic RIFF file format support: * Support for AIFF files with ID3v2 tags. * Support for WAV files with ID3v2 tags. diff --git a/README.md b/README.md index 7efe35e3..eb7f968b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ https://taglib.org/ TagLib is a library for reading and editing the metadata of several -popular audio formats. Currently it supports both ID3v1 and [ID3v2][] +popular audio formats. Currently, it supports both ID3v1 and [ID3v2][] for MP3 files, [Ogg Vorbis][] comments and ID3 tags in [FLAC][], MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4, APE, and ASF files. diff --git a/bindings/c/tag_c.h b/bindings/c/tag_c.h index 23e93854..f72e1f79 100644 --- a/bindings/c/tag_c.h +++ b/bindings/c/tag_c.h @@ -57,8 +57,8 @@ extern "C" { *******************************************************************************/ /* - * These are used for type provide some type safety to the C API (as opposed to - * using void *, but pointers to them are simply cast to the corresponding C++ + * These are used to give the C API some type safety (as opposed to + * using void * ), but pointers to them are simply cast to the corresponding C++ * types in the implementation. */ diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp index 60defa45..08d164c3 100644 --- a/taglib/it/itfile.cpp +++ b/taglib/it/itfile.cpp @@ -244,7 +244,7 @@ void IT::File::read(bool) // I don't count disabled and muted channels. // But this always gives 64 channels for all my files anyway. // Strangely VLC does report other values. I wonder how VLC - // gets it's values. + // gets its values. if(static_cast(pannings[i]) < 128 && volumes[i] > 0) ++channels; } diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index 267dd67d..6c37a6a6 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -143,7 +143,7 @@ Frame *Frame::createTextualFrame(const String &key, const StringList &values) // frame->setText(values.front()); return frame; } - // if non of the above cases apply, we use a TXXX frame with the key as description + // if none of the above cases apply, we use a TXXX frame with the key as description return new UserTextIdentificationFrame(keyToTXXX(key), values, String::UTF8); } diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index ac14750e..5f692804 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -193,7 +193,7 @@ Frame *FrameFactory::createFrame(const ByteVector &data, Frame::Header *header, ByteVector frameID = header->frameID(); // This is where things get necessarily nasty. Here we determine which - // Frame subclass (or if none is found simply an Frame) based + // Frame subclass (or if none is found simply a Frame) based // on the frame ID. Since there are a lot of possibilities, that means // a lot of if blocks. @@ -488,7 +488,7 @@ bool FrameFactory::updateFrame(Frame::Header *header) const return false; } - // ID3v2.2 only used 3 bytes for the frame ID, so we need to convert all of + // ID3v2.2 only used 3 bytes for the frame ID, so we need to convert all // the frames to their 4 byte ID3v2.4 equivalent. for(const auto &[o, t] : frameConversion2) { diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index ce358f35..7b44e5f5 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -182,7 +182,7 @@ String ID3v2::Tag::genre() const // ID3v2.4 lists genres as the fields in its frames field list. If the field // is simply a number it can be assumed that it is an ID3v1 genre number. - // Here was assume that if an ID3v1 string is present that it should be + // Here was assumed that if an ID3v1 string is present then it should be // appended to the genre string. Multiple fields will be appended as the // string is built. diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp index 210ce512..dd2411d3 100644 --- a/taglib/mpeg/mpegheader.cpp +++ b/taglib/mpeg/mpegheader.cpp @@ -220,7 +220,7 @@ void MPEG::Header::parse(File *file, offset_t offset, bool checkLength) std::array { 11025, 12000, 8000, 0 } // Version 2.5 }; - // The sample rate index is encoded as two bits in the 3nd byte, i.e. xxxx11xx + // The sample rate index is encoded as two bits in the 3rd byte, i.e. xxxx11xx const int samplerateIndex = (static_cast(data[2]) >> 2) & 0x03; @@ -230,7 +230,7 @@ void MPEG::Header::parse(File *file, offset_t offset, bool checkLength) return; } - // The channel mode is encoded as a 2 bit value at the end of the 3nd byte, + // The channel mode is encoded as a 2 bit value at the end of the 3rd byte, // i.e. xxxxxx11 d->channelMode = static_cast((static_cast(data[3]) >> 6) & 0x03); diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp index e1ccb129..fbe7ff05 100644 --- a/taglib/ogg/xiphcomment.cpp +++ b/taglib/ogg/xiphcomment.cpp @@ -322,7 +322,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const ByteVector data; // Add the vendor ID length and the vendor ID. It's important to use the - // length of the data(String::UTF8) rather than the length of the the string + // length of the data(String::UTF8) rather than the length of the string // since this is UTF8 text and there may be more characters in the data than // in the UTF16 string. @@ -335,7 +335,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const data.append(ByteVector::fromUInt(fieldCount(), false)); - // Iterate over the the field lists. Our iterator returns a + // Iterate over the field lists. Our iterator returns a // std::pair where the first String is the field name and // the StringList is the values associated with that field. diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h index a9d7ee7e..dba8cbb3 100644 --- a/taglib/xm/xmproperties.h +++ b/taglib/xm/xmproperties.h @@ -36,7 +36,7 @@ namespace TagLib { public: /*! Flag bits. */ enum { - LinearFreqTable = 1 // otherwise its the amiga freq. table + LinearFreqTable = 1 // otherwise it is the amiga freq. table }; Properties(AudioProperties::ReadStyle propertiesStyle);