mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-16 22:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taglib2

Browse Source 
Conflicts:
	taglib/ogg/opus/opusfile.cpp
	taglib/riff/wav/wavfile.cpp
	taglib/toolkit/tstring.h
This commit is contained in:
Lukáš Lalinský
2013-07-11 10:14:09 +02:00
parent 45e8e83041 3a636c752b
commit 48191904f1
30 changed files with 449 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
taglib/asf/asffile.h
View File

@ -53,7 +53,8 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*
* \note In the current implementation, both \a readProperties and
* \a propertiesStyle are ignored.
* \a propertiesStyle are ignored. The audio properties are always
* read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
@ -64,7 +65,8 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*
* \note In the current implementation, both \a readProperties and
* \a propertiesStyle are ignored.
* \a propertiesStyle are ignored. The audio properties are always
* read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
@ -118,7 +120,6 @@ namespace TagLib {
virtual bool save();
private:
int readBYTE(bool *ok = 0);
int readWORD(bool *ok = 0);
unsigned int readDWORD(bool *ok = 0);