mirror of
				https://github.com/taglib/taglib.git
				synced 2025-10-31 07:46:22 -04:00 
			
		
		
		
	Fix the same bug that I fixed in MPEG last week -- allow the lib user to
specify the ID3v2FrameFactory in the FLAC::File construstor. git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@302629 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
		| @ -88,12 +88,22 @@ public: | ||||
| //////////////////////////////////////////////////////////////////////////////// | ||||
|  | ||||
| FLAC::File::File(const char *file, bool readProperties, | ||||
|                  Properties::ReadStyle propertiesStyle) : TagLib::File(file) | ||||
|                  Properties::ReadStyle propertiesStyle) : | ||||
|   TagLib::File(file) | ||||
| { | ||||
|   d = new FilePrivate; | ||||
|   read(readProperties, propertiesStyle); | ||||
| } | ||||
|  | ||||
| FLAC::File::File(const char *file, ID3v2::FrameFactory *frameFactory, | ||||
|                  bool readProperties, Properties::ReadStyle propertiesStyle) : | ||||
|   TagLib::File(file) | ||||
| { | ||||
|   d = new FilePrivate; | ||||
|   d->ID3v2FrameFactory = frameFactory; | ||||
|   read(readProperties, propertiesStyle); | ||||
| } | ||||
|  | ||||
| FLAC::File::~File() | ||||
| { | ||||
|   delete d; | ||||
|  | ||||
| @ -57,13 +57,26 @@ namespace TagLib { | ||||
|     { | ||||
|     public: | ||||
|       /*! | ||||
|        * Contructs an FLAC file from \a file.  If \a readProperties is true the | ||||
|        * Contructs a FLAC 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. | ||||
|        */ | ||||
|       File(const char *file, bool readProperties = true, | ||||
|            Properties::ReadStyle propertiesStyle = Properties::Average); | ||||
|  | ||||
|       /*! | ||||
|        * Contructs a FLAC 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. | ||||
|        * | ||||
|        * If this file contains and ID3v2 tag the frames will be created using | ||||
|        * \a frameFactory. | ||||
|        */ | ||||
|       // BIC: merge with the above constructor | ||||
|       File(const char *file, ID3v2::FrameFactory *frameFactory, | ||||
|            bool readProperties = true, | ||||
|            Properties::ReadStyle propertiesStyle = Properties::Average); | ||||
|  | ||||
|       /*! | ||||
|        * Destroys this instance of the File. | ||||
|        */ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user