mirror of
https://github.com/taglib/taglib.git
synced 2026-07-13 23:01:17 -04:00
Use Unicode filenames on Windows (this time the correct patch).
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@734975 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
@@ -71,7 +71,7 @@ TagLib::uint Frame::headerSize(uint version)
|
||||
ByteVector Frame::textDelimiter(String::Type t)
|
||||
{
|
||||
ByteVector d = char(0);
|
||||
if(t == String::UTF16 || t == String::UTF16BE)
|
||||
if(t == String::UTF16 || t == String::UTF16BE || t == String::UTF16LE)
|
||||
d.append(char(0));
|
||||
return d;
|
||||
}
|
||||
|
||||
@@ -51,17 +51,17 @@ namespace TagLib {
|
||||
* <a href="id3v2-structure.html#6.2">6.2</a>). The default \a length of
|
||||
* 4 is used if another value is not specified.
|
||||
*/
|
||||
uint toUInt(const ByteVector &data);
|
||||
TAGLIB_EXPORT uint toUInt(const ByteVector &data);
|
||||
|
||||
/*!
|
||||
* Returns a 4 byte (32 bit) synchsafe integer based on \a value.
|
||||
*/
|
||||
ByteVector fromUInt(uint value);
|
||||
TAGLIB_EXPORT ByteVector fromUInt(uint value);
|
||||
|
||||
/*!
|
||||
* Deunsynchronize the data (in-place).
|
||||
*/
|
||||
void decode(ByteVector &data);
|
||||
TAGLIB_EXPORT void decode(ByteVector &data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ public:
|
||||
// public members
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
MPEG::File::File(const char *file, bool readProperties,
|
||||
MPEG::File::File(FileName file, bool readProperties,
|
||||
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
|
||||
{
|
||||
d = new FilePrivate;
|
||||
@@ -235,7 +235,7 @@ MPEG::File::File(const char *file, bool readProperties,
|
||||
}
|
||||
}
|
||||
|
||||
MPEG::File::File(const char *file, ID3v2::FrameFactory *frameFactory,
|
||||
MPEG::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
|
||||
bool readProperties, Properties::ReadStyle propertiesStyle) :
|
||||
TagLib::File(file)
|
||||
{
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace TagLib {
|
||||
* \deprecated This constructor will be dropped in favor of the one below
|
||||
* in a future version.
|
||||
*/
|
||||
File(const char *file, bool readProperties = true,
|
||||
File(FileName file, bool readProperties = true,
|
||||
Properties::ReadStyle propertiesStyle = Properties::Average);
|
||||
|
||||
/*!
|
||||
@@ -87,7 +87,7 @@ namespace TagLib {
|
||||
* \a frameFactory.
|
||||
*/
|
||||
// BIC: merge with the above constructor
|
||||
File(const char *file, ID3v2::FrameFactory *frameFactory,
|
||||
File(FileName file, ID3v2::FrameFactory *frameFactory,
|
||||
bool readProperties = true,
|
||||
Properties::ReadStyle propertiesStyle = Properties::Average);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user