mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups -- no functional changes.

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@503573 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Scott Wheeler 2006-01-29 16:06:07 +00:00
parent 99fbe7ff25
commit 286d474dae
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flac/flacfile.cpp
View File

@ -34,9 +34,10 @@
using namespace TagLib;
namespace TagLib {
namespace FLAC {
enum BLOCK_TYPE { STREAMINFO = 0, PADDING, APPLICATION, SEEKTABLE, VORBISCOMMENT, CUESHEET };
}}
namespace FLAC {
enum BlockType { StreamInfo = 0, Padding, Application, SeekTable, VorbisComment, CueSheet };
}
}
class FLAC::File::FilePrivate
{
@ -79,9 +80,9 @@ public:
FLAC::Tag *tag;
Properties *properties;
// Map<BLOCK_TYPE, ByteVector> metaData;
ByteVector streamInfoData;
ByteVector xiphCommentData;
long flacStart;
long streamStart;
long streamLength;
@ -180,7 +181,7 @@ bool FLAC::File::save()
length = header.mid(1, 3).toUInt();
// Type is vorbiscomment
if(blockType == 4) {
if(blockType == VorbisComment) {
v[0] = header[0];
insert(v, nextPageOffset, length + 4);
break;
@ -330,7 +331,6 @@ ByteVector FLAC::File::streamInfoData()
{
if (isValid())
return d->streamInfoData;
// return d->metaData[STREAMINFO];
else
return ByteVector();
}
@ -339,7 +339,6 @@ ByteVector FLAC::File::xiphCommentData()
{
if (isValid() && d->hasXiphComment)
return d->xiphCommentData;
// return d->metaData[VORBISCOMMENT];
else
return ByteVector();
}
@ -395,13 +394,13 @@ void FLAC::File::scan()
uint length = header.mid(1, 3).toUInt();
// First block should be the stream_info metadata
if(blockType != 0) {
if(blockType != StreamInfo) {
debug("FLAC::File::scan() -- invalid FLAC stream");
setValid(false);
return;
}
d->streamInfoData = readBlock(length);
// d->metadata.insert(STREAMINFO, readBlock(length));
nextPageOffset += length + 4;
// Search through the remaining metadata
@ -412,13 +411,12 @@ void FLAC::File::scan()
lastBlock = header[0] & 0x80;
length = header.mid(1, 3).toUInt();
if(blockType == 1) {
if(blockType == Padding) {
// debug("FLAC::File::scan() -- Padding found");
}
// Found the vorbis-comment
else if(blockType == 4) {
else if(blockType == VorbisComment) {
d->xiphCommentData = readBlock(length);
// d->metadata.insert(VORBISCOMMENT, readBlock(length));
d->hasXiphComment = true;
}