otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

SoundUnit: reset sample memory on reset()

Browse source
This commit is contained in:
tildearrow 2023-01-24 03:05:23 -05:00
parent 7b2588c176
commit 68c8a77498
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/platform/su.cpp
View file

@ -497,6 +497,9 @@ void DivPlatformSoundUnit::reset() {
rWrite(0x9d,ilCtrl); rWrite(0x9d,ilCtrl);
rWrite(0xbc,ilSize); rWrite(0xbc,ilSize);
rWrite(0xbd,fil1); rWrite(0xbd,fil1);
// copy sample memory
memcpy(su->pcm,sampleMem,sampleMemSize?65536:8192);
} }
int DivPlatformSoundUnit::getOutputCount() { int DivPlatformSoundUnit::getOutputCount() {
@ -545,7 +548,7 @@ void DivPlatformSoundUnit::poke(std::vector<DivRegWrite>& wlist) {
} }
const void* DivPlatformSoundUnit::getSampleMem(int index) { const void* DivPlatformSoundUnit::getSampleMem(int index) {
return (index==0)?su->pcm:NULL; return (index==0)?sampleMem:NULL;
} }
size_t DivPlatformSoundUnit::getSampleMemCapacity(int index) { size_t DivPlatformSoundUnit::getSampleMemCapacity(int index) {
@ -563,7 +566,7 @@ bool DivPlatformSoundUnit::isSampleLoaded(int index, int sample) {
} }
void DivPlatformSoundUnit::renderSamples(int sysID) { void DivPlatformSoundUnit::renderSamples(int sysID) {
memset(su->pcm,0,getSampleMemCapacity(0)); memset(sampleMem,0,sampleMemSize?65536:8192);
memset(sampleOffSU,0,256*sizeof(unsigned int)); memset(sampleOffSU,0,256*sizeof(unsigned int));
memset(sampleLoaded,0,256*sizeof(bool)); memset(sampleLoaded,0,256*sizeof(bool));
@ -582,10 +585,10 @@ void DivPlatformSoundUnit::renderSamples(int sysID) {
break; break;
} }
if (memPos+paddedLen>=getSampleMemCapacity(0)) { if (memPos+paddedLen>=getSampleMemCapacity(0)) {
memcpy(su->pcm+memPos,s->data8,getSampleMemCapacity(0)-memPos); memcpy(sampleMem+memPos,s->data8,getSampleMemCapacity(0)-memPos);
logW("out of PCM memory for sample %d!",i); logW("out of PCM memory for sample %d!",i);
} else { } else {
memcpy(su->pcm+memPos,s->data8,paddedLen); memcpy(sampleMem+memPos,s->data8,paddedLen);
sampleLoaded[i]=true; sampleLoaded[i]=true;
} }
sampleOffSU[i]=memPos; sampleOffSU[i]=memPos;
@ -593,6 +596,8 @@ void DivPlatformSoundUnit::renderSamples(int sysID) {
} }
sampleMemLen=memPos; sampleMemLen=memPos;
sysIDCache=sysID; sysIDCache=sysID;
memcpy(su->pcm,sampleMem,sampleMemSize?65536:8192);
} }
int DivPlatformSoundUnit::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) { int DivPlatformSoundUnit::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {
@ -604,6 +609,8 @@ int DivPlatformSoundUnit::init(DivEngine* p, int channels, int sugRate, const Di
oscBuf[i]=new DivDispatchOscBuffer; oscBuf[i]=new DivDispatchOscBuffer;
} }
su=new SoundUnit(); su=new SoundUnit();
sampleMem=new unsigned char[65536];
memset(sampleMem,0,65536);
sysIDCache=0; sysIDCache=0;
setFlags(flags); setFlags(flags);
reset(); reset();
@ -615,6 +622,7 @@ void DivPlatformSoundUnit::quit() {
delete oscBuf[i]; delete oscBuf[i];
} }
delete su; delete su;
delete sampleMem;
} }
DivPlatformSoundUnit::~DivPlatformSoundUnit() { DivPlatformSoundUnit::~DivPlatformSoundUnit() {

1
src/engine/platform/su.h
View file

@ -89,6 +89,7 @@ class DivPlatformSoundUnit: public DivDispatch {
short tempR; short tempR;
unsigned char sampleBank, lfoMode, lfoSpeed; unsigned char sampleBank, lfoMode, lfoSpeed;
SoundUnit* su; SoundUnit* su;
unsigned char* sampleMem;
size_t sampleMemLen; size_t sampleMemLen;
unsigned char regPool[128]; unsigned char regPool[128];
double NOTE_SU(int ch, int note); double NOTE_SU(int ch, int note);