Cleanup some warnings

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
master
Alexander Golubev 3 weeks ago
parent baa4672751
commit 90de1ea9b9

@ -110,14 +110,15 @@ bool WavDecoder::openFile(File* src) {
find_data: find_data:
src->lseek(d->pos); src->lseek(d->pos);
src->read((char*)buffer, 4); src->read((char*)buffer, 4);
if (memcmp(buffer, "data", 4) != 0) if (memcmp(buffer, "data", 4) != 0) {
if (memcmp(buffer, "clm ", 4) != 0) if (memcmp(buffer, "clm ", 4) != 0) {
goto invalid; goto invalid;
else { } else {
src->read((char*)buffer, 4); src->read((char*)buffer, 4);
d->pos = d->pos+ 8 + buffer[0] + buffer[1]*256; d->pos = d->pos+ 8 + buffer[0] + buffer[1]*256;
goto find_data; goto find_data;
} }
}
src->lseek(d->pos+8); // start of data src->lseek(d->pos+8); // start of data
d->position = 0; d->position = 0;

@ -17,7 +17,7 @@ Stringify ( unsigned int profile ) // profile is 0...15, where 7...13
} }
// read information from SV8 header // read information from SV8 header
int StreamInfo::ReadHeaderSV8 ( MPC_reader* fp ) int StreamInfo::ReadHeaderSV8 ( MPC_reader* /*fp*/ )
{ {
return 0; return 0;
} }

@ -66,12 +66,13 @@ static bool checkOggFLAC(File *src) {
bool res = false; bool res = false;
src->lseek(0); src->lseek(0);
if (src->read(header, 34) == 34) if (src->read(header, 34) == 34)
if (memcmp(header, "OggS",4) == 0 ) if (memcmp(header, "OggS",4) == 0 ) {
// old FLAC 1.1.0 format // old FLAC 1.1.0 format
if (memcmp(header+28, "fLaC",4) == 0) res = true; if (memcmp(header+28, "fLaC",4) == 0) res = true;
else else
// new FLAC 1.1.1 format // new FLAC 1.1.1 format
if (memcmp(header+29, "FLAC",4) == 0) res = true; if (memcmp(header+29, "FLAC",4) == 0) res = true;
}
return res; return res;
} }

Loading…
Cancel
Save