zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-18 02:12:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix libsndfile file handler

Browse source
This commit is contained in:
Chris Robinson 2014-06-19 18:30:19 -07:00
parent eeae36fbf7
commit 1310a4a814
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sound/sndfile_decoder.cpp
View file

@ -12,8 +12,7 @@ sf_count_t SndFileDecoder::file_seek(sf_count_t offset, int whence, void *user_d
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data); SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
long cur = ftell(self->File); long cur = ftell(self->File);
if(cur < 0 || (unsigned long)cur < self->FileLength) if(cur < 0) return -1;
return -1;
switch(whence) switch(whence)
{ {
@ -51,8 +50,7 @@ sf_count_t SndFileDecoder::file_read(void *ptr, sf_count_t count, void *user_dat
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data); SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
long cur = ftell(self->File); long cur = ftell(self->File);
if(cur < 0 || (unsigned long)cur < self->FileLength) if(cur < 0) return -1;
return -1;
cur -= self->FileOffset; cur -= self->FileOffset;
if(count > (sf_count_t)(self->FileLength-cur)) if(count > (sf_count_t)(self->FileLength-cur))
@ -172,7 +170,7 @@ bool SndFileDecoder::open(const char *data, size_t length)
bool SndFileDecoder::open(const char *fname, size_t offset, size_t length) bool SndFileDecoder::open(const char *fname, size_t offset, size_t length)
{ {
SF_VIRTUAL_IO sfio = { mem_get_filelen, mem_seek, mem_read, mem_write, mem_tell }; SF_VIRTUAL_IO sfio = { file_get_filelen, file_seek, file_read, file_write, file_tell };
FileOffset = offset; FileOffset = offset;
FileLength = length; FileLength = length;