etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GCC

This commit is contained in:
cam900 2022-05-03 12:55:36 +09:00
parent a601d0eea5
commit 83e58e0205
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/platform/es5506.cpp
View File

@ -963,13 +963,13 @@ size_t DivPlatformES5506::getSampleMemUsage(int index) {
void DivPlatformES5506::renderSamples() { void DivPlatformES5506::renderSamples() {
memset(sampleMem,0,getSampleMemCapacity()); memset(sampleMem,0,getSampleMemCapacity());
int memPos=128; size_t memPos=128;
for (int i=0; i<parent->song.sampleLen; i++) { for (int i=0; i<parent->song.sampleLen; i++) {
DivSample* s=parent->song.sample[i]; DivSample* s=parent->song.sample[i];
unsigned int length=s->length16; unsigned int length=s->length16;
// fit sample size to single bank size // fit sample size to single bank size
if (length>(2097152-64)*sizeof(short)) { if (length>(4194304-128)) {
length=(2097152-64)*sizeof(short); length=4194304-128;
} }
if ((memPos&0xc00000)!=((memPos+length+128)&0xc00000)) { if ((memPos&0xc00000)!=((memPos+length+128)&0xc00000)) {
memPos=((memPos+0x3fffff)&0xc00000)+128; memPos=((memPos+0x3fffff)&0xc00000)+128;
@ -979,7 +979,7 @@ void DivPlatformES5506::renderSamples() {
break; break;
} }
if (memPos+length>=(getSampleMemCapacity()-128)) { if (memPos+length>=(getSampleMemCapacity()-128)) {
memcpy(sampleMem+(memPos/sizeof(short)),s->data16,getSampleMemCapacity()-memPos-128); memcpy(sampleMem+(memPos/sizeof(short)),s->data16,(getSampleMemCapacity()-128)-memPos);
logW("out of ES5506 memory for sample %d!",i); logW("out of ES5506 memory for sample %d!",i);
} else { } else {
memcpy(sampleMem+(memPos/sizeof(short)),s->data16,length); memcpy(sampleMem+(memPos/sizeof(short)),s->data16,length);