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

MMC5: acquireDirect(), part 2

Browse source 
PCM now works
This commit is contained in:
tildearrow 2025-03-07 03:12:18 -05:00
parent 1070fb5d10
commit 47f176b0f0
2 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/engine/platform/mmc5.cpp
View file

@ -63,14 +63,28 @@ void DivPlatformMMC5::acquireDirect(blip_buffer_t** bb, size_t len) {
extcl_envelope_clock_MMC5(mmc5);
extcl_length_clock_MMC5(mmc5);
for (size_t i=0; i<len; i++) {
/*
// heuristic
int pcmAdvance=1;
if (dacSample==-1) {
break;
} else {
pcmAdvance=len-i;
if (dacPeriod>0) {
int remainTime=(rate-dacPeriod+dacRate-1)/dacRate;
if (remainTime<pcmAdvance) pcmAdvance=remainTime;
if (remainTime<1) pcmAdvance=1;
}
}
i+=pcmAdvance-1;
if (dacSample!=-1) {
dacPeriod+=dacRate;
dacPeriod+=dacRate*pcmAdvance;
if (dacPeriod>=rate) {
DivSample* s=parent->getSample(dacSample);
if (s->samples>0 && dacPos<s->samples) {
if (!isMuted[2]) {
rWrite(0x5011,((unsigned char)s->data8[dacPos]+0x80));
extcl_cpu_wr_mem_MMC5(mmc5,i,0x5011,((unsigned char)s->data8[dacPos]+0x80));
}
dacPos++;
if (s->isLoopable() && dacPos>=(unsigned int)s->loopEnd) {
@ -84,33 +98,8 @@ void DivPlatformMMC5::acquireDirect(blip_buffer_t** bb, size_t len) {
}
}
}
*/
}
extcl_apu_tick_MMC5(mmc5,len);
break;
/*
if (mmc5->clocked) {
mmc5->clocked=false;
}
int sample=isMuted[0]?0:(mmc5->S3.output*10);
if (!isMuted[1]) {
sample+=mmc5->S4.output*10;
}
if (!isMuted[2]) {
sample+=mmc5->pcm.output*2;
}
if (sample>32767) sample=32767;
if (sample<-32768) sample=-32768;
buf[0][i]=sample;
if (++writeOscBuf>=32) {
writeOscBuf=0;
oscBuf[0]->putSample(i,isMuted[0]?0:((mmc5->S3.output)<<11));
oscBuf[1]->putSample(i,isMuted[1]?0:((mmc5->S4.output)<<11));
oscBuf[2]->putSample(i,isMuted[2]?0:((mmc5->pcm.output)<<7));
}*/
}
for (int i=0; i<3; i++) {
oscBuf[i]->end(len);

3
src/engine/platform/sound/nes/mmc5.cpp
View file

@ -42,6 +42,9 @@ void map_init_MMC5(struct _mmc5* mmc5) {
mmc5->oscBuf[0] = NULL;
mmc5->oscBuf[1] = NULL;
mmc5->oscBuf[2] = NULL;
mmc5->S3.timer = 2048;
mmc5->S4.timer = 2048;
}
void extcl_cpu_wr_mem_MMC5(struct _mmc5* mmc5, int ts, WORD address, BYTE value) {
if (address < 0x5000) {