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

Support the new OggFLAC 1.0 standard from FLAC 1.1.2

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@398574 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Allan Sandfeld Jensen 2005-03-18 00:02:27 +00:00
parent 1aff3947ef
commit a89ce9ce0c
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ogg/flac/oggflacfile.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************
copyright : (C) 2004 by Allan Sandfeld Jensen
copyright : (C) 2004-2005 by Allan Sandfeld Jensen
email : kde@carewolf.org
***************************************************************************/
@ -178,16 +178,33 @@ void Ogg::FLAC::File::scan()
if(!isValid())
return;
int ipacket = 1;
int ipacket = 0;
long overhead = 0;
ByteVector metadataHeader = packet(ipacket);
ByteVector metadataHeader = packet(ipacket++);
if(metadataHeader.isNull())
return;
ByteVector header = metadataHeader.mid(0,4);
ByteVector header;
if (!metadataHeader.startsWith("fLaC")) {
// FLAC 1.1.2+
if (metadataHeader.startsWith("\x7fFLAC")) return;
if (metadataHeader[5] != 1) return; // not version 1
metadataHeader = metadataHeader.mid(13);
}
else {
// FLAC 1.1.0 & 1.1.1
metadataHeader = packet(ipacket++);
if(metadataHeader.isNull())
return;
}
header = metadataHeader.mid(0,4);
// Header format (from spec):
// <1> Last-metadata-block flag
// <7> BLOCK_TYPE
@ -215,7 +232,10 @@ void Ogg::FLAC::File::scan()
// Search through the remaining metadata
while(!lastBlock) {
metadataHeader = packet(++ipacket);
metadataHeader = packet(ipacket++);
if(metadataHeader.isNull())
return;
header = metadataHeader.mid(0, 4);
blockType = header[0] & 0x7f;