mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 09:08:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

No reason to store this in the d-pointer

Browse Source
This commit is contained in:
Scott Wheeler 2014-09-18 10:23:42 +02:00
parent 4b67beffc8
commit e6d7dd08f2
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ public:
uint endTime;
uint startOffset;
uint endOffset;
const FrameFactory *factory;
FrameListMap embeddedFrameListMap;
FrameList embeddedFrameList;
};
@ -54,7 +53,6 @@ ChapterFrame::ChapterFrame(const ByteVector &data) :
ID3v2::Frame(data)
{
d = new ChapterFramePrivate;
d->factory = FrameFactory::instance();
setData(data);
}
@ -70,7 +68,6 @@ ChapterFrame::ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT
FrameList l = eF;
for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
addEmbeddedFrame(*it);
d->factory = FrameFactory::instance();
}
ChapterFrame::~ChapterFrame()
@ -225,7 +222,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
size -= pos;
while((uint)embPos < size - Frame::headerSize(4))
{
Frame *frame = d->factory->createFrame(data.mid(pos + embPos));
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos));
if(!frame)
return;
@ -261,6 +258,5 @@ ChapterFrame::ChapterFrame(const ByteVector &data, Header *h) :
Frame(h)
{
d = new ChapterFramePrivate;
d->factory = FrameFactory::instance();
parseFields(fieldData(data));
}

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

@ -39,7 +39,6 @@ public:
bool isTopLevel;
bool isOrdered;
ByteVectorList childElements;
const FrameFactory *factory;
FrameListMap embeddedFrameListMap;
FrameList embeddedFrameList;
};
@ -52,7 +51,6 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &data) :
ID3v2::Frame(data)
{
d = new TableOfContentsFramePrivate;
d->factory = FrameFactory::instance();
setData(data);
}
@ -65,7 +63,6 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &eID, const ByteVect
FrameList l = eF;
for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
addEmbeddedFrame(*it);
d->factory = FrameFactory::instance();
}
TableOfContentsFrame::~TableOfContentsFrame()
@ -244,7 +241,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
size -= pos;
while((uint)embPos < size - Frame::headerSize(4))
{
Frame *frame = d->factory->createFrame(data.mid(pos + embPos));
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos));
if(!frame)
return;
@ -288,6 +285,5 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &data, Header *h) :
Frame(h)
{
d = new TableOfContentsFramePrivate;
d->factory = FrameFactory::instance();
parseFields(fieldData(data));
}