aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS6
-rw-r--r--taglib/dsdiff/dsdifffile.h6
-rw-r--r--taglib/dsf/dsffile.h4
-rw-r--r--taglib/it/itfile.cpp2
-rw-r--r--taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp2
-rw-r--r--taglib/mpeg/id3v2/frames/textidentificationframe.cpp2
-rw-r--r--taglib/mpeg/id3v2/id3v2extendedheader.h2
-rw-r--r--taglib/mpeg/id3v2/id3v2frame.h4
-rw-r--r--taglib/mpeg/id3v2/id3v2tag.h2
-rw-r--r--taglib/ogg/oggpageheader.h2
-rw-r--r--taglib/toolkit/tfilestream.cpp3
-rw-r--r--taglib/xm/xmfile.cpp4
-rw-r--r--tests/test_fileref.cpp6
-rw-r--r--tests/test_id3v2.cpp4
14 files changed, 25 insertions, 24 deletions
diff --git a/NEWS b/NEWS
index 8f8b8ac1..434cae9e 100644
--- a/NEWS
+++ b/NEWS
@@ -245,7 +245,7 @@ TagLib 1.6.3 (Apr 17, 2010)
* Fixed definitions of the TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF macros.
* Fixed upgrading of ID3v2.3 genre frame with ID3v1 code 0 (Blues).
* New method `int String::toInt(bool *ok)` which can return whether the
- conversion to a number was successfull.
+ conversion to a number was successful.
* Fixed parsing of incorrectly written lengths in ID3v2 (affects mainly
compressed frames). (BUG:231075)
@@ -253,7 +253,7 @@ TagLib 1.6.2 (Apr 9, 2010)
==========================
* Read Vorbis Comments from the first FLAC metadata block, if there are
- multipe ones. (BUG:211089)
+ multiple ones. (BUG:211089)
* Fixed a memory leak in FileRef's OGA format detection.
* Fixed compilation with the Sun Studio compiler. (BUG:215225)
* Handle WM/TrackNumber attributes with DWORD content in WMA files.
@@ -288,7 +288,7 @@ TagLib 1.6 (Sep 13, 2009)
* Added support for disabling dllimport/dllexport on Windows using the
TAGLIB_STATIC macro.
* Support for parsing the obsolete 'gnre' MP4 atom.
- * New cpp macros TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF to determin if
+ * New cpp macros TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF to determine if
TagLib was built with MP4/ASF support.
1.6 RC1:
diff --git a/taglib/dsdiff/dsdifffile.h b/taglib/dsdiff/dsdifffile.h
index 8b888744..9248a3e3 100644
--- a/taglib/dsdiff/dsdifffile.h
+++ b/taglib/dsdiff/dsdifffile.h
@@ -40,9 +40,9 @@ namespace TagLib {
*
* This supports an ID3v2 tag as well as reading stream from the ID3 RIFF
* chunk as well as properties from the file.
- * Description of the DSDIFF format is available
+ * Description of the DSDIFF format is available
* at http://dsd-guide.com/sites/default/files/white-papers/DSDIFF_1.5_Spec.pdf
- * DSDIFF standard does not explictly specify the ID3V2 chunk
+ * DSDIFF standard does not explicitly specify the ID3V2 chunk
* It can be found at the root level, but also sometimes inside the PROP chunk
* In addition, title and artist info are stored as part of the standard
*/
@@ -178,7 +178,7 @@ namespace TagLib {
bool hasID3v2Tag() const;
/*!
- * Returns whether or not the file on disk actually has the DSDIFF
+ * Returns whether or not the file on disk actually has the DSDIFF
* Title & Artist tag.
*
* \see DIINTag()
diff --git a/taglib/dsf/dsffile.h b/taglib/dsf/dsffile.h
index e75298d7..aac288f8 100644
--- a/taglib/dsf/dsffile.h
+++ b/taglib/dsf/dsffile.h
@@ -55,7 +55,7 @@ namespace TagLib {
{
public:
/*!
- * Contructs an DSF file from \a file. If \a readProperties is true the
+ * Constructs an DSF file from \a file. If \a readProperties is true the
* file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored.
*/
@@ -63,7 +63,7 @@ namespace TagLib {
Properties::ReadStyle propertiesStyle = Properties::Average);
/*!
- * Contructs an DSF file from \a file. If \a readProperties is true the
+ * Constructs an DSF file from \a file. If \a readProperties is true the
* file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored.
*/
diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp
index 19dee235..3b35f0d8 100644
--- a/taglib/it/itfile.cpp
+++ b/taglib/it/itfile.cpp
@@ -277,7 +277,7 @@ void IT::File::read(bool)
// in the instrument/sample names and more characters
// afterwards. The spec does not mention such a case.
// Currently I just discard anything after a nil, but
- // e.g. VLC seems to interprete a nil as a space. I
+ // e.g. VLC seems to interpret a nil as a space. I
// don't know what is the proper behaviour.
for(unsigned short i = 0; i < instrumentCount; ++ i) {
seek(192L + length + ((long)i << 2));
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index efe89d17..9bd63fbe 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -55,7 +55,7 @@ public:
namespace {
// These functions are needed to try to aim for backward compatibility with
- // an API that previously (unreasonably) required null bytes to be appeneded
+ // an API that previously (unreasonably) required null bytes to be appended
// at the end of identifiers explicitly by the API user.
// BIC: remove these
diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index 61cf6ed8..9b1eacd1 100644
--- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -277,7 +277,7 @@ PropertyMap TextIdentificationFrame::makeTIPLProperties() const
break;
}
if(!found){
- // invalid involved role -> mark whole frame as unsupported in order to be consisten with writing
+ // invalid involved role -> mark whole frame as unsupported in order to be consistent with writing
map.clear();
map.unsupportedData().append(frameID());
return map;
diff --git a/taglib/mpeg/id3v2/id3v2extendedheader.h b/taglib/mpeg/id3v2/id3v2extendedheader.h
index 6d9386e6..64662338 100644
--- a/taglib/mpeg/id3v2/id3v2extendedheader.h
+++ b/taglib/mpeg/id3v2/id3v2extendedheader.h
@@ -38,7 +38,7 @@ namespace TagLib {
/*!
* This class implements ID3v2 extended headers. It attempts to follow,
- * both semantically and programatically, the structure specified in
+ * both semantically and programmatically, the structure specified in
* the ID3v2 standard. The API is based on the properties of ID3v2 extended
* headers specified there. If any of the terms used in this documentation
* are unclear please check the specification in the linked section.
diff --git a/taglib/mpeg/id3v2/id3v2frame.h b/taglib/mpeg/id3v2/id3v2frame.h
index a179cd42..ad2056da 100644
--- a/taglib/mpeg/id3v2/id3v2frame.h
+++ b/taglib/mpeg/id3v2/id3v2frame.h
@@ -224,7 +224,7 @@ namespace TagLib {
* This is useful for reading strings sequentially.
*/
String readStringField(const ByteVector &data, String::Type encoding,
- int *positon = 0);
+ int *position = 0);
/*!
* Checks a the list of string values to see if they can be used with the
@@ -255,7 +255,7 @@ namespace TagLib {
/*!
- * Parses the contents of this frame as PropertyMap. If that fails, the returend
+ * Parses the contents of this frame as PropertyMap. If that fails, the returned
* PropertyMap will be empty, and its unsupportedData() will contain this frame's
* ID.
* BIC: Will be a virtual function in future releases.
diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h
index 4367181f..7cb86946 100644
--- a/taglib/mpeg/id3v2/id3v2tag.h
+++ b/taglib/mpeg/id3v2/id3v2tag.h
@@ -310,7 +310,7 @@ namespace TagLib {
* - otherwise, the key "LYRICS:<description>" is used;
* - if the frame ID is "TIPL" (involved peoples list), and if all the
* roles defined in the frame are known in TextIdentificationFrame::involvedPeopleMap(),
- * then "<role>=<name>" will be contained in the returned obejct for each
+ * then "<role>=<name>" will be contained in the returned object for each
* - if the frame ID is "TMCL" (musician credit list), then
* "PERFORMER:<instrument>=<name>" will be contained in the returned
* PropertyMap for each defined musician
diff --git a/taglib/ogg/oggpageheader.h b/taglib/ogg/oggpageheader.h
index 42f67307..571155fc 100644
--- a/taglib/ogg/oggpageheader.h
+++ b/taglib/ogg/oggpageheader.h
@@ -156,7 +156,7 @@ namespace TagLib {
/*!
* A special value of containing the position of the packet to be
* interpreted by the codec. It is only supported here so that it may be
- * coppied from one page to another.
+ * copied from one page to another.
*
* \see absoluteGranularPosition()
*/
diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 487df8e3..94bd3362 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -264,7 +264,7 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo
// Now I'll explain the steps in this ugliness:
// First, make sure that we're working with a buffer that is longer than
- // the *differnce* in the tag sizes. We want to avoid overwriting parts
+ // the *difference* in the tag sizes. We want to avoid overwriting parts
// that aren't yet in memory, so this is necessary.
unsigned long bufferLength = bufferSize();
@@ -493,6 +493,7 @@ void FileStream::truncate(long length)
#else
+ fflush(d->file);
const int error = ftruncate(fileno(d->file), length);
if(error != 0)
debug("FileStream::truncate() -- Coundn't truncate the file.");
diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp
index 216dfd8c..e10e8f01 100644
--- a/taglib/xm/xmfile.cpp
+++ b/taglib/xm/xmfile.cpp
@@ -592,7 +592,7 @@ void XM::File::read(bool)
sumSampleCount += sampleCount;
// wouldn't know which header size to assume otherwise:
READ_ASSERT(instrumentHeaderSize >= count + 4 && readU32L(sampleHeaderSize));
- // skip unhandeled header proportion:
+ // skip unhandled header proportion:
seek(instrumentHeaderSize - count - 4, Current);
for(unsigned short j = 0; j < sampleCount; ++ j) {
@@ -620,7 +620,7 @@ void XM::File::read(bool)
unsigned int count = sample.read(*this, sampleHeaderSize);
READ_ASSERT(count == std::min(sampleHeaderSize, (unsigned long)sample.size()));
- // skip unhandeled header proportion:
+ // skip unhandled header proportion:
seek(sampleHeaderSize - count, Current);
offset += sampleLength;
diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index 8394b875..afdc140c 100644
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -292,12 +292,12 @@ public:
{
fileRefSave<RIFF::AIFF::File>("alaw", ".aifc");
}
-
+
void testDSF()
{
fileRefSave<DSF::File>("empty10ms",".dsf");
}
-
+
void testDSDIFF()
{
fileRefSave<DSDIFF::File>("empty10ms",".dff");
@@ -314,7 +314,7 @@ public:
void testCreate()
{
- // This is depricated. But worth it to test.
+ // This is deprecated. But worth it to test.
File *f = FileRef::create(TEST_FILE_PATH_C("empty_vorbis.oga"));
CPPUNIT_ASSERT(dynamic_cast<Ogg::Vorbis::File*>(f));
diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index 8c6f67dc..0e36d77f 100644
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -56,8 +56,8 @@ class PublicFrame : public ID3v2::Frame
public:
PublicFrame() : ID3v2::Frame(ByteVector("XXXX\0\0\0\0\0\0", 10)) {}
String readStringField(const ByteVector &data, String::Type encoding,
- int *positon = 0)
- { return ID3v2::Frame::readStringField(data, encoding, positon); }
+ int *position = 0)
+ { return ID3v2::Frame::readStringField(data, encoding, position); }
virtual String toString() const { return String(); }
virtual void parseFields(const ByteVector &) {}
virtual ByteVector renderFields() const { return ByteVector(); }
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 13:37:09 +0000