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

Revert "Hide a private static variable."

Browse Source 
This reverts commit 25ffbcb4b9b04326edd1d25a785b686951a0f235.

# Conflicts:
#	taglib/mpeg/id3v2/id3v2framefactory.cpp
#	taglib/mpeg/id3v2/id3v2framefactory.h
This commit is contained in:
Tsuda Kageyu 2016-04-22 09:27:04 +09:00
parent 31f3109b47
commit 0a85f9b227
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taglib/mpeg/id3v2/id3v2framefactory.cpp
View File

@ -102,13 +102,14 @@ public:
}
};
FrameFactory FrameFactory::factory;
////////////////////////////////////////////////////////////////////////////////
// public members
////////////////////////////////////////////////////////////////////////////////
FrameFactory *FrameFactory::instance()
{
static FrameFactory factory;
return &factory;
}
@ -538,4 +539,3 @@ bool FrameFactory::updateFrame(Frame::Header *header) const
return true;
}

3
taglib/mpeg/id3v2/id3v2framefactory.h
View File

@ -66,7 +66,6 @@ namespace TagLib {
{
public:
static FrameFactory *instance();
/*!
* Create a frame based on \a data. \a synchSafeInts should only be set
* false if we are parsing an old tag (v2.3 or older) that does not support
@ -153,6 +152,8 @@ namespace TagLib {
FrameFactory(const FrameFactory &);
FrameFactory &operator=(const FrameFactory &);
static FrameFactory factory;
class FrameFactoryPrivate;
FrameFactoryPrivate *d;
};