Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix childs -> children

This commit is contained in:
Martchus 2019-12-30 22:54:11 +01:00
parent 49798ae3a8
commit b2c02e9acc
10 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
genericfileelement.h
View File

@ -453,7 +453,7 @@ template <class ImplementationType> inline const ImplementationType *GenericFile
* \brief Returns the first child of the element.
*
* The current element keeps ownership over the returned element.
* If no childs are present nullptr is returned.
* If no children are present nullptr is returned.
*
* \remarks parse() needs to be called before.
*/
@ -466,7 +466,7 @@ template <class ImplementationType> inline ImplementationType *GenericFileElemen
* \brief Returns the first child of the element.
*
* The current element keeps ownership over the returned element.
* If no childs are present nullptr is returned.
* If no children are present nullptr is returned.
*
* \remarks parse() needs to be called before.
*/
@ -479,7 +479,7 @@ template <class ImplementationType> inline const ImplementationType *GenericFile
* \brief Returns the last child of the element.
*
* The current element keeps ownership over the returned element.
* If no childs are present nullptr is returned.
* If no children are present nullptr is returned.
*
* \remarks parse() needs to be called before.
*/
@ -497,7 +497,7 @@ template <class ImplementationType> inline ImplementationType *GenericFileElemen
* \brief Returns the last child of the element.
*
* The current element keeps ownership over the returned element.
* If no childs are present nullptr is returned.
* If no children are present nullptr is returned.
*
* \remarks parse() needs to be called before.
*/
@ -843,7 +843,7 @@ void GenericFileElement<ImplementationType>::copyHeader(std::ostream &targetStre
}
/*!
* \brief Writes the element without its childs to the specified \a targetStream.
* \brief Writes the element without its children to the specified \a targetStream.
*/
template <class ImplementationType>
void GenericFileElement<ImplementationType>::copyWithoutChilds(std::ostream &targetStream, Diagnostics &diag, AbortableProgressFeedback *progress)
@ -856,7 +856,7 @@ void GenericFileElement<ImplementationType>::copyWithoutChilds(std::ostream &tar
}
/*!
* \brief Writes the entire element including all childs to the specified \a targetStream.
* \brief Writes the entire element including all children to the specified \a targetStream.
*/
template <class ImplementationType>
void GenericFileElement<ImplementationType>::copyEntirely(std::ostream &targetStream, Diagnostics &diag, AbortableProgressFeedback *progress)

2
matroska/matroskachapter.cpp
View File

@ -44,7 +44,7 @@ void MatroskaChapter::internalParse(Diagnostics &diag)
// clear previous values and status
static const string context("parsing \"ChapterAtom\"-element");
clear();
// iterate through childs of "ChapterAtom"-element
// iterate through children of "ChapterAtom"-element
for (EbmlElement *chapterAtomChild = m_chapterAtomElement->firstChild(); chapterAtomChild; chapterAtomChild = chapterAtomChild->nextSibling()) {
chapterAtomChild->parse(diag);
switch (chapterAtomChild->id()) {

16
matroska/matroskacontainer.cpp
View File

@ -105,7 +105,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag)
break;
case MatroskaIds::Cues:
cuesElementsFound = true;
// parse childs of "Cues"-element ("CuePoint"-elements)
// parse children of "Cues"-element ("CuePoint"-elements)
for (EbmlElement *cuePointElement = segmentChildElement->firstChild(); cuePointElement;
cuePointElement = cuePointElement->nextSibling()) {
cuePointElement->parse(diag);
@ -115,7 +115,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag)
case EbmlIds::Crc32:
break;
case MatroskaIds::CuePoint:
// parse childs of "CuePoint"-element
// parse children of "CuePoint"-element
for (EbmlElement *cuePointChildElement = cuePointElement->firstChild(); cuePointChildElement;
cuePointChildElement = cuePointChildElement->nextSibling()) {
cuePointChildElement->parse(diag);
@ -250,7 +250,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag)
}
break;
case MatroskaIds::Cluster:
// parse childs of "Cluster"-element
// parse children of "Cluster"-element
for (EbmlElement *clusterElementChild = segmentChildElement->firstChild(); clusterElementChild;
clusterElementChild = clusterElementChild->nextSibling()) {
clusterElementChild->parse(diag);
@ -459,7 +459,7 @@ void MatroskaContainer::internalParseHeader(Diagnostics &diag)
break;
}
} catch (const Failure &) {
diag.emplace_back(DiagLevel::Critical, "Unable to parse all childs of EBML header.", context);
diag.emplace_back(DiagLevel::Critical, "Unable to parse all children of EBML header.", context);
break;
}
}
@ -567,7 +567,7 @@ void MatroskaContainer::internalParseHeader(Diagnostics &diag)
break;
}
} catch (const Failure &) {
diag.emplace_back(DiagLevel::Critical, "Unable to parse all childs of \"Segment\"-element.", context);
diag.emplace_back(DiagLevel::Critical, "Unable to parse all children of \"Segment\"-element.", context);
break;
}
}
@ -1112,7 +1112,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
segment.infoDataSize += 2 + EbmlElement::calculateSizeDenotationLength(title.size()) + title.size();
}
}
// -> add size of other childs
// -> add size of other children
for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) {
level2Element->parse(diag);
switch (level2Element->id()) {
@ -1593,7 +1593,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
outputWriter.writeUInt32BE(MatroskaIds::SegmentInfo);
sizeLength = EbmlElement::makeSizeDenotation(segment.infoDataSize, buff);
outputStream.write(buff, sizeLength);
// -> write childs
// -> write children
for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) {
switch (level2Element->id()) {
case EbmlIds::Void: // skipped
@ -1699,7 +1699,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
outputWriter.writeUInt32BE(MatroskaIds::Cluster);
sizeLength = EbmlElement::makeSizeDenotation(*clusterSizesIterator, buff);
outputStream.write(buff, sizeLength);
// write childs
// write children
for (level2Element = level1Element->firstChild(); level2Element; level2Element = level2Element->nextSibling()) {
switch (level2Element->id()) {
case EbmlIds::Void:

12
matroska/matroskacues.cpp
View File

@ -56,7 +56,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di
std::uint64_t cuesElementSize = 0, cuePointElementSize, cueTrackPositionsElementSize, cueReferenceElementSize, pos, relPos, statePos;
EbmlElement *cueRelativePositionElement, *cueClusterPositionElement;
for (EbmlElement *cuePointElement = cuesElement->firstChild(); cuePointElement; cuePointElement = cuePointElement->nextSibling()) {
// parse childs of "Cues"-element which must be "CuePoint"-elements
// parse children of "Cues"-element which must be "CuePoint"-elements
cuePointElement->parse(diag);
switch (cuePointElement->id()) {
case EbmlIds::Void:
@ -65,7 +65,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di
case MatroskaIds::CuePoint:
cuePointElementSize = 0;
for (EbmlElement *cuePointChild = cuePointElement->firstChild(); cuePointChild; cuePointChild = cuePointChild->nextSibling()) {
// parse childs of "CuePoint"-element
// parse children of "CuePoint"-element
cuePointChild->parse(diag);
switch (cuePointChild->id()) {
case EbmlIds::Void:
@ -80,7 +80,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di
cueRelativePositionElement = cueClusterPositionElement = nullptr;
for (EbmlElement *cueTrackPositionsChild = cuePointChild->firstChild(); cueTrackPositionsChild;
cueTrackPositionsChild = cueTrackPositionsChild->nextSibling()) {
// parse childs of "CueTrackPositions"-element
// parse children of "CueTrackPositions"-element
cueTrackPositionsChild->parse(diag);
switch (cueTrackPositionsChild->id()) {
case MatroskaIds::CueTrack:
@ -106,7 +106,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di
cueReferenceElementSize = 0;
for (EbmlElement *cueReferenceChild = cueTrackPositionsChild->firstChild(); cueReferenceChild;
cueReferenceChild = cueReferenceChild->nextSibling()) {
// parse childs of "CueReference"-element
// parse children of "CueReference"-element
cueReferenceChild->parse(diag);
switch (cueReferenceChild->id()) {
case EbmlIds::Void:
@ -293,7 +293,7 @@ void MatroskaCuePositionUpdater::make(ostream &stream, Diagnostics &diag)
case MatroskaIds::CueTrack:
case MatroskaIds::CueDuration:
case MatroskaIds::CueBlockNumber:
// write unchanged childs of "CueTrackPositions"-element
// write unchanged children of "CueTrackPositions"-element
cueTrackPositionsChild->copyBuffer(stream);
cueTrackPositionsChild->discardBuffer();
//cueTrackPositionsChild->copyEntirely(stream);
@ -327,7 +327,7 @@ void MatroskaCuePositionUpdater::make(ostream &stream, Diagnostics &diag)
break;
case MatroskaIds::CueRefTime:
case MatroskaIds::CueRefNumber:
// write unchanged childs of "CueReference"-element
// write unchanged children of "CueReference"-element
cueReferenceChild->copyBuffer(stream);
cueReferenceChild->discardBuffer();
cueReferenceChild->copyEntirely(stream, diag, nullptr);

2
matroska/matroskatag.cpp
View File

@ -153,7 +153,7 @@ void MatroskaTag::parseTargets(EbmlElement &targetsElement, Diagnostics &diag)
try {
child->parse(diag);
} catch (const Failure &) {
diag.emplace_back(DiagLevel::Critical, "Unable to parse childs of Targets element.", context);
diag.emplace_back(DiagLevel::Critical, "Unable to parse children of Targets element.", context);
break;
}
switch (child->id()) {

2
matroska/matroskatrack.cpp
View File

@ -289,7 +289,7 @@ void MatroskaTrack::internalParseHeader(Diagnostics &diag)
diag.emplace_back(DiagLevel::Critical, "Unable to parse track element.", context);
throw;
}
// read information about the track from the childs of the track entry element
// read information about the track from the children of the track entry element
for (EbmlElement *trackInfoElement = m_trackElement->firstChild(), *subElement = nullptr; trackInfoElement;
trackInfoElement = trackInfoElement->nextSibling()) {
try {

4
mp4/mp4atom.cpp
View File

@ -258,8 +258,8 @@ bool Mp4Atom::isPadding() const
*
* \remarks This information is not read from the atom header. The offsets are known
* for specific atoms.
* \remarks This method returns zero for non-parent atoms which have no childs.
* \remarks Childs with variable offset such as the "esds"-atom must be denoted!
* \remarks This method returns zero for non-parent atoms which have no children.
* \remarks Children with variable offset such as the "esds"-atom must be denoted!
*/
std::uint64_t Mp4Atom::firstChildOffset() const
{

6
mp4/mp4container.cpp
View File

@ -377,7 +377,7 @@ void Mp4Container::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback
// ignore meta data here; it is added separately
break;
default:
// add size of unknown childs of the user data atom
// add size of unknown children of the user data atom
userDataAtomSize += level2Atom->totalSize();
level2Atom->makeBuffer();
}
@ -392,7 +392,7 @@ void Mp4Container::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback
// ignore track atoms here; they are added separately
break;
default:
// add size of unknown childs of the movie atom
// add size of unknown children of the movie atom
movieAtomSize += level1Atom->totalSize();
level1Atom->makeBuffer();
}
@ -962,7 +962,7 @@ void Mp4Container::updateOffsets(const std::vector<std::int64_t> &oldMdatOffsets
}
}
} catch (const Failure &) {
diag.emplace_back(DiagLevel::Critical, "Unable to parse childs of top-level atom moof.", context);
diag.emplace_back(DiagLevel::Critical, "Unable to parse children of top-level atom moof.", context);
}
}
} catch (const Failure &) {

2
mp4/mp4tagfield.cpp
View File

@ -257,7 +257,7 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag)
"Unkown child atom \"" % dataAtom->idToString() + "\" in tag atom (ilst child) found. (will be ignored)", context);
}
} catch (const Failure &) {
diag.emplace_back(DiagLevel::Warning, "Unable to parse all childs atom in tag atom (ilst child) found. (will be ignored)", context);
diag.emplace_back(DiagLevel::Warning, "Unable to parse all children atom in tag atom (ilst child) found. (will be ignored)", context);
}
}
if (value().isEmpty()) {

2
mp4/mp4track.cpp
View File

@ -1110,7 +1110,7 @@ std::uint64_t Mp4Track::requiredSize(Diagnostics &diag) const
}
// ... mdia header + hdlr total size + minf header
size += 8 + (33 + m_name.size()) + 8;
// ... minf childs
// ... minf children
bool dinfAtomWritten = false;
if (m_minfAtom) {
for (Mp4Atom *childAtom = m_minfAtom->firstChild(); childAtom; childAtom = childAtom->nextSibling()) {