mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #398 from TsudaKageyu/fix-chap

Browse Source 
Fixed some compilation error on MSVC in CHAP and CTOC frames support.
This commit is contained in:
Lukáš Lalinský 2014-07-16 22:30:10 +02:00
commit b509106031
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taglib/mpeg/id3v2/frames/chapterframe.cpp
View File

@ -183,11 +183,11 @@ PropertyMap ChapterFrame::asProperties() const
PropertyMap map;
map.unsupportedData().append(frameID() + String("/") + d->elementID);
return map;
}
ChapterFrame *ChapterFrame::findByElementID(const Tag *tag, const ByteVector &eID) // static
ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVector &eID) // static
{
ID3v2::FrameList comments = tag->frameList("CHAP");
@ -238,7 +238,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
embPos += frame->size() + Frame::headerSize(4);
addEmbeddedFrame(frame);
}
}
}
ByteVector ChapterFrame::renderFields() const
@ -253,7 +253,7 @@ ByteVector ChapterFrame::renderFields() const
FrameList l = d->embeddedFrameList;
for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
data.append((*it)->render());
return data;
}

10
taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
View File

@ -184,7 +184,7 @@ PropertyMap TableOfContentsFrame::asProperties() const
PropertyMap map;
map.unsupportedData().append(frameID() + String("/") + d->elementID);
return map;
}
@ -204,7 +204,7 @@ TableOfContentsFrame *TableOfContentsFrame::findByElementID(const ID3v2::Tag *ta
return 0;
}
TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const Tag *tag) // static
TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag) // static
{
ID3v2::FrameList tablesOfContents = tag->frameList("CTOC");
@ -240,7 +240,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
childElementID.append(char(0));
d->childElements.append(childElementID);
}
size -= pos;
while((uint)embPos < size - Frame::headerSize(4))
{
@ -257,7 +257,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
embPos += frame->size() + Frame::headerSize(4);
addEmbeddedFrame(frame);
}
}
}
ByteVector TableOfContentsFrame::renderFields() const
@ -280,7 +280,7 @@ ByteVector TableOfContentsFrame::renderFields() const
FrameList l = d->embeddedFrameList;
for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
data.append((*it)->render());
return data;
}