OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Use a FileReader to handle music resources and audio decoding

Browse source 
Instead of the previous method where there'd be a filename and offset, and/or a
memory pointer, this uses a class to access resource data regardless of its
underlying form.
This commit is contained in:
Chris Robinson 2014-06-25 04:25:36 -07:00
commit 0017e1e6e8
29 changed files with 554 additions and 853 deletions
Download patch file Download diff file Expand all files Collapse all files

162
src/sound/sndfile_decoder.cpp
View file

@ -1,62 +1,26 @@
#include "sndfile_decoder.h"
#include "files.h"
#ifdef HAVE_SNDFILE
sf_count_t SndFileDecoder::file_get_filelen(void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
return self->FileLength;
FileReader *reader = reinterpret_cast<SndFileDecoder*>(user_data)->Reader;
return reader->GetLength();
}
sf_count_t SndFileDecoder::file_seek(sf_count_t offset, int whence, void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
FileReader *reader = reinterpret_cast<SndFileDecoder*>(user_data)->Reader;
long cur = ftell(self->File);
if(cur < 0) return -1;
switch(whence)
{
case SEEK_SET:
if(offset < 0 || offset > (sf_count_t)self->FileLength)
return -1;
cur = offset;
break;
case SEEK_CUR:
cur -= self->FileOffset;
if((offset > 0 && (sf_count_t)(self->FileLength-cur) < offset) ||
(offset < 0 && (sf_count_t)cur < -offset))
return -1;
cur += offset;
break;
case SEEK_END:
if(offset > 0 || -offset > (sf_count_t)self->FileLength)
return -1;
cur = self->FileLength + offset;
break;
default:
return -1;
}
if(fseek(self->File, cur + self->FileOffset, SEEK_SET) != 0)
if(reader->Seek(offset, whence) != 0)
return -1;
return cur;
return reader->Tell();
}
sf_count_t SndFileDecoder::file_read(void *ptr, sf_count_t count, void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
long cur = ftell(self->File);
if(cur < 0) return -1;
cur -= self->FileOffset;
if(count > (sf_count_t)(self->FileLength-cur))
count = self->FileLength-cur;
return fread(ptr, 1, count, self->File);
FileReader *reader = reinterpret_cast<SndFileDecoder*>(user_data)->Reader;
return reader->Read(ptr, count);
}
sf_count_t SndFileDecoder::file_write(const void *ptr, sf_count_t count, void *user_data)
@ -66,75 +30,8 @@ sf_count_t SndFileDecoder::file_write(const void *ptr, sf_count_t count, void *u
sf_count_t SndFileDecoder::file_tell(void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
long cur = ftell(self->File);
if(cur < 0 || (unsigned long)cur < self->FileLength)
return -1;
return cur - self->FileOffset;
}
sf_count_t SndFileDecoder::mem_get_filelen(void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
return self->MemLength;
}
sf_count_t SndFileDecoder::mem_seek(sf_count_t offset, int whence, void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
switch(whence)
{
case SEEK_SET:
if(offset < 0 || offset > (sf_count_t)self->MemLength)
return -1;
self->MemPos = offset;
break;
case SEEK_CUR:
if((offset > 0 && (sf_count_t)(self->MemLength-self->MemPos) < offset) ||
(offset < 0 && (sf_count_t)self->MemPos < -offset))
return -1;
self->MemPos += offset;
break;
case SEEK_END:
if(offset > 0 || -offset > (sf_count_t)self->MemLength)
return -1;
self->MemPos = self->MemLength + offset;
break;
default:
return -1;
}
return self->MemPos;
}
sf_count_t SndFileDecoder::mem_read(void *ptr, sf_count_t count, void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
if(count > (sf_count_t)(self->MemLength-self->MemPos))
count = self->MemLength-self->MemPos;
memcpy(ptr, self->MemData+self->MemPos, count);
self->MemPos += count;
return count;
}
sf_count_t SndFileDecoder::mem_write(const void *ptr, sf_count_t count, void *user_data)
{
return -1;
}
sf_count_t SndFileDecoder::mem_tell(void *user_data)
{
SndFileDecoder *self = reinterpret_cast<SndFileDecoder*>(user_data);
return self->MemPos;
FileReader *reader = reinterpret_cast<SndFileDecoder*>(user_data)->Reader;
return reader->Tell();
}
@ -143,18 +40,13 @@ SndFileDecoder::~SndFileDecoder()
if(SndFile)
sf_close(SndFile);
SndFile = 0;
if(File)
fclose(File);
File = 0;
}
bool SndFileDecoder::open(const char *data, size_t length)
bool SndFileDecoder::open(FileReader *reader)
{
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 };
MemData = data;
MemPos = 0;
MemLength = length;
Reader = reader;
SndFile = sf_open_virtual(&sfio, SFM_READ, &SndInfo, this);
if(SndFile)
{
@ -168,34 +60,6 @@ bool SndFileDecoder::open(const char *data, size_t length)
return false;
}
bool SndFileDecoder::open(const char *fname, size_t offset, size_t length)
{
SF_VIRTUAL_IO sfio = { file_get_filelen, file_seek, file_read, file_write, file_tell };
FileOffset = offset;
FileLength = length;
File = fopen(fname, "rb");
if(File)
{
if(fseek(File, offset, SEEK_SET) == 0)
{
SndFile = sf_open_virtual(&sfio, SFM_READ, &SndInfo, this);
if(SndFile)
{
if(SndInfo.channels == 1 || SndInfo.channels == 2)
return true;
sf_close(SndFile);
SndFile = 0;
}
}
fclose(File);
File = 0;
}
return false;
}
void SndFileDecoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
{
*samplerate = SndInfo.samplerate;