mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-19 05:24:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

String to number conversion moved to new function - long readNumber(ByteVector vector)

Browse Source
This commit is contained in:
Daniel Faust
2011-07-07 17:57:22 +02:00
parent 27332c35ac
commit 0ea8e44df7
2 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
taglib/mpeg/mpegfile.cpp
View File

@ -607,54 +607,8 @@ void MPEG::File::findLyrics3v2()
seek(offset, End);
ByteVector sizeVector = readBlock(6);
long size = 15;
int exp = 1;
int value = 0;
for(int i=sizeVector.size(); i>0; i--) {
switch(sizeVector.at(i-1)) {
case '1': {
value = 1;
break;
}
case '2': {
value = 2;
break;
}
case '3': {
value = 3;
break;
}
case '4': {
value = 4;
break;
}
case '5': {
value = 5;
break;
}
case '6': {
value = 6;
break;
}
case '7': {
value = 7;
break;
}
case '8': {
value = 8;
break;
}
case '9': {
value = 9;
break;
}
default:
value = 0;
}
size += value * exp;
exp *= 10;
}
d->lyrics3v2Size = size;
d->lyrics3v2Size = 15 + readNumber(sizeVector);
return;
}
}
@ -690,6 +644,58 @@ void MPEG::File::findAPE()
d->APEFooterLocation = -1;
}
long MPEG::File::readNumber(ByteVector vector)
{
long number = 0;
int exp = 1;
int value = 0;
for(int i=vector.size(); i>0; i--) {
switch(vector.at(i-1)) {
case '1': {
value = 1;
break;
}
case '2': {
value = 2;
break;
}
case '3': {
value = 3;
break;
}
case '4': {
value = 4;
break;
}
case '5': {
value = 5;
break;
}
case '6': {
value = 6;
break;
}
case '7': {
value = 7;
break;
}
case '8': {
value = 8;
break;
}
case '9': {
value = 9;
break;
}
default:
value = 0;
}
number += value * exp;
exp *= 10;
}
return number;
}
bool MPEG::File::secondSynchByte(char byte)
{
if(uchar(byte) == 0xff)

5
taglib/mpeg/mpegfile.h
View File

@ -290,6 +290,11 @@ namespace TagLib {
void findLyrics3v2();
void findAPE();
/*!
* Extracts a number from a ByteVector
*/
long readNumber(ByteVector vector);
/*!
* MPEG frames can be recognized by the bit pattern 11111111 111, so the
* first byte is easy to check for, however checking to see if the second byte