mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-14 02:54:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

CVS_SILENT nitpicks

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@301909 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler
2004-04-07 07:58:06 +00:00
parent 15d3c3c71a
commit 5861cb8e00
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ogg/flac/oggflacfile.cpp
View File

@ -65,7 +65,7 @@ public:
////////////////////////////////////////////////////////////////////////////////
Ogg::FLAC::File::File(const char *file, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(file)
Properties::ReadStyle propertiesStyle) : Ogg::File(file)
{
d = new FilePrivate;
read(readProperties, propertiesStyle);
@ -93,7 +93,7 @@ void Ogg::FLAC::File::save()
// Create FLAC metadata-block:
// Put the size in the first 32 bit ( I assume no more than 24 bit are used )
// Put the size in the first 32 bit (I assume no more than 24 bit are used)
ByteVector v = ByteVector::fromUInt(d->xiphCommentData.size());
@ -142,9 +142,8 @@ void Ogg::FLAC::File::read(bool readProperties, Properties::ReadStyle properties
if(d->hasXiphComment)
d->comment = new Ogg::XiphComment(xiphCommentData());
else {
d->comment = new Ogg::XiphComment();
}
else
d->comment = new Ogg::XiphComment;
if(readProperties)
@ -184,7 +183,7 @@ void Ogg::FLAC::File::scan()
ByteVector metadataHeader = packet(ipacket);
if (metadataHeader == ByteVector::null)
if(metadataHeader.isNull())
return;
ByteVector header = metadataHeader.mid(0,4);
@ -192,7 +191,7 @@ void Ogg::FLAC::File::scan()
// Header format (from spec):
// <1> Last-metadata-block flag
// <7> BLOCK_TYPE
// 0 : STREAMINFO
// 0 : STREAMINFO
// 1 : PADDING
// ..
// 4 : VORBIS_COMMENT
@ -225,17 +224,16 @@ void Ogg::FLAC::File::scan()
overhead += length;
if(blockType == 1) {
// debug("Ogg::FLAC::File::scan() -- Padding found");
} else
if(blockType == 4) {
// debug("Ogg::FLAC::File::scan() -- Vorbis-comments found");
// debug("Ogg::FLAC::File::scan() -- Padding found");
}
else if(blockType == 4) {
// debug("Ogg::FLAC::File::scan() -- Vorbis-comments found");
d->xiphCommentData = metadataHeader.mid(4, length);
d->hasXiphComment = true;
d->commentPacket = ipacket;
} else
if(blockType > 5) {
debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
}
else if(blockType > 5)
debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
}

3
ogg/flac/oggflacfile.h
View File

@ -59,7 +59,8 @@ namespace TagLib {
public:
/*!
* Contructs an Ogg/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.
* 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);