diff --git a/taglib/ape/ape-tag-format.txt b/taglib/ape/ape-tag-format.txt index 21ff1c86..cb6f46ff 100644 --- a/taglib/ape/ape-tag-format.txt +++ b/taglib/ape/ape-tag-format.txt @@ -49,8 +49,8 @@ APE Tag Version 2.000 (with header, recommended): APE tag items should be sorted ascending by size. When streaming, parts of the APE tag may be dropped to reduce the danger of drop outs between tracks. This -is not required, but is strongly recommended. It would be desirable for the i -tems to be sorted by importance / size, but this is not feasible. This +is not required, but is strongly recommended. It would be desirable for the +items to be sorted by importance / size, but this is not feasible. This convention should only be broken when adding less important small items and it is not desirable to rewrite the entire tag. An APE tag at the end of a file (the recommended location) must have at least a footer; an APE tag at the diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index de41c58d..87ac1852 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -305,7 +305,7 @@ MP4::Tag::parseCovr(const MP4::Atom *atom) const int length = static_cast(data.toUInt(pos)); if(length < 12) { debug("MP4: Too short atom"); - break;; + break; } const ByteVector name = data.mid(pos + 4, 4); diff --git a/taglib/mpeg/id3v2/frames/chapterframe.h b/taglib/mpeg/id3v2/frames/chapterframe.h index 64ee19d3..0eaa140f 100644 --- a/taglib/mpeg/id3v2/frames/chapterframe.h +++ b/taglib/mpeg/id3v2/frames/chapterframe.h @@ -57,7 +57,7 @@ namespace TagLib { * \a startTime, end time \a endTime, start offset \a startOffset, * end offset \a endOffset and optionally a list of embedded frames, * whose ownership will then be taken over by this Frame, in - * \a embeededFrames; + * \a embeddedFrames; * * All times are in milliseconds. */ diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/taglib/mpeg/id3v2/frames/relativevolumeframe.h index de01254c..55f13fce 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.h +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.h @@ -155,7 +155,7 @@ namespace TagLib { * available and returns 0 if the specified channel does not exist. * * \see setVolumeAdjustmentIndex() - * \see volumeAjustment() + * \see volumeAdjustment() */ short volumeAdjustmentIndex(ChannelType type = MasterVolume) const; @@ -167,7 +167,7 @@ namespace TagLib { * By default this sets the value for the master volume. * * \see volumeAdjustmentIndex() - * \see setVolumeAjustment() + * \see setVolumeAdjustment() */ void setVolumeAdjustmentIndex(short index, ChannelType type = MasterVolume); diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index af4136af..f2414b16 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -417,7 +417,7 @@ namespace {"TYER", "TDRC"}, // 2.3 -> 2.4 {"TIME", "TDRC"}, // 2.3 -> 2.4 }; - const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);; + const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]); } String Frame::frameIDToKey(const ByteVector &id) diff --git a/taglib/mpeg/id3v2/id3v2frame.h b/taglib/mpeg/id3v2/id3v2frame.h index ac531f36..b14f6f42 100644 --- a/taglib/mpeg/id3v2/id3v2frame.h +++ b/taglib/mpeg/id3v2/id3v2frame.h @@ -47,7 +47,7 @@ namespace TagLib { * split between a collection of frames (which are in turn split into fields * (Structure, 4) * (Frames). This class provides an API for - * gathering information about and modifying ID3v2 frames. Funtionallity + * gathering information about and modifying ID3v2 frames. Functionality * specific to a given frame type is handed in one of the many subclasses. */ diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index e1e31307..cc276d44 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -284,7 +284,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, const Header *tagHe return f; } - // Synchronised lyrics/text (frames 4.9) + // Synchronized lyrics/text (frames 4.9) if(frameID == "SYLT") { SynchronizedLyricsFrame *f = new SynchronizedLyricsFrame(data, header); diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h index e8ff6062..9605c788 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.h +++ b/taglib/mpeg/id3v2/id3v2framefactory.h @@ -46,7 +46,7 @@ namespace TagLib { * * Reimplementing this factory is the key to adding support for frame types * not directly supported by TagLib to your application. To do so you would - * subclass this factory reimplement createFrame(). Then by setting your + * subclass this factory and reimplement createFrame(). Then by setting your * factory to be the default factory in ID3v2::Tag constructor you can * implement behavior that will allow for new ID3v2::Frame subclasses (also * provided by you) to be used. diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h index 7709b839..74d1df1e 100644 --- a/taglib/mpeg/id3v2/id3v2tag.h +++ b/taglib/mpeg/id3v2/id3v2tag.h @@ -393,7 +393,7 @@ namespace TagLib { void setTextFrame(const ByteVector &id, const String &value); /*! - * Dowgrade frames from ID3v2.4 (used internally and by default) to ID3v2.3 + * Downgrade frames from ID3v2.4 (used internally and by default) to ID3v2.3. */ void downgradeFrames(FrameList *existingFrames, FrameList *newFrames) const; diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp index ebd637af..b353f880 100644 --- a/taglib/s3m/s3mfile.cpp +++ b/taglib/s3m/s3mfile.cpp @@ -183,7 +183,7 @@ void S3M::File::read(bool) // "ultra click" and "use panning values" (if == 0xFC). // I don't see them in any spec, though. // Hm, but there is "UltraClick-removal" and some other - // variables in ScreamTracker IIIs GUI. + // variables in ScreamTracker III's GUI. seek(12, Current); diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h index 4243fe7a..bdc4f124 100644 --- a/taglib/toolkit/tfile.h +++ b/taglib/toolkit/tfile.h @@ -72,11 +72,11 @@ namespace TagLib { /*! * Used to specify if when saving files, if values between different tag - * types should be syncronized. + * types should be synchronized. */ enum DuplicateTags { - Duplicate, //file); const int error = ftruncate(fileno(d->file), length); if(error != 0) - debug("FileStream::truncate() -- Coundn't truncate the file."); + debug("FileStream::truncate() -- Couldn't truncate the file."); #endif } diff --git a/taglib/toolkit/tzlib.cpp b/taglib/toolkit/tzlib.cpp index 6d07ba3d..4b348df5 100644 --- a/taglib/toolkit/tzlib.cpp +++ b/taglib/toolkit/tzlib.cpp @@ -57,7 +57,7 @@ ByteVector zlib::decompress(const ByteVector &data) z_stream stream = {}; if(inflateInit(&stream) != Z_OK) { - debug("zlib::decompress() - Failed to initizlize zlib."); + debug("zlib::decompress() - Failed to initialize zlib."); return ByteVector(); } diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index e10e8f01..0455338d 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -566,7 +566,7 @@ void XM::File::read(bool) seek(patternHeaderLength - (4 + count) + dataSize, Current); } - StringList intrumentNames; + StringList instrumentNames; StringList sampleNames; unsigned int sumSampleCount = 0; @@ -630,12 +630,12 @@ void XM::File::read(bool) else { offset = instrumentHeaderSize - count; } - intrumentNames.append(instrumentName); + instrumentNames.append(instrumentName); seek(offset, Current); } d->properties.setSampleCount(sumSampleCount); - String comment(intrumentNames.toString("\n")); + String comment(instrumentNames.toString("\n")); if(!sampleNames.isEmpty()) { comment += "\n"; comment += sampleNames.toString("\n");