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

Refactoring

Browse source
This commit is contained in:
Waldemar Pawlaszek 2022-12-23 07:06:17 +01:00
parent f1c40082d6
commit 2423ec9bc6
4 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/engine/platform/pokey.cpp
View file

@ -96,16 +96,16 @@ void DivPlatformPOKEY::acquireMZ(short* buf, size_t start, size_t len) {
void DivPlatformPOKEY::acquireASAP(short* buf, size_t start, size_t len) {
while (!writes.empty()) {
QueuedWrite w=writes.front();
altASAP->write(w.addr, w.val);
altASAP.write(w.addr, w.val);
writes.pop();
}
for (size_t h=start; h<start+len; h++) {
if (++oscBufDelay>=2) {
oscBufDelay=0;
buf[h]=altASAP->sampleAudio(oscBuf);
buf[h]=altASAP.sampleAudio(oscBuf);
} else {
buf[h]=altASAP->sampleAudio();
buf[h]=altASAP.sampleAudio();
}
}
}
@ -396,7 +396,7 @@ DivDispatchOscBuffer* DivPlatformPOKEY::getOscBuffer(int ch) {
unsigned char* DivPlatformPOKEY::getRegisterPool() {
if (useAltASAP) {
return const_cast<unsigned char*>(altASAP->getRegisterPool());
return const_cast<unsigned char*>(altASAP.getRegisterPool());
} else {
return regPool;
}
@ -418,7 +418,7 @@ void DivPlatformPOKEY::reset() {
}
if (useAltASAP) {
altASAP->reset();
altASAP.reset();
} else {
ResetPokeyState(&pokey);
}
@ -454,11 +454,9 @@ void DivPlatformPOKEY::setFlags(const DivConfig& flags) {
for (int i=0; i<4; i++) {
oscBuf[i]->rate=rate/2;
}
if (altASAP) {
delete altASAP;
}
altASAP=new AltASAP::Pokey(chipClock,rate);
altASAP.init(chipClock,rate);
} else {
MZPOKEYSND_Init(&pokey);
rate=chipClock;
for (int i=0; i<4; i++) {
oscBuf[i]->rate=rate/14;
@ -479,16 +477,11 @@ int DivPlatformPOKEY::init(DivEngine* p, int channels, int sugRate, const DivCon
dumpWrites=false;
skipRegisterWrites=false;
oscBufDelay=0;
altASAP=NULL;
for (int i=0; i<4; i++) {
isMuted[i]=false;
oscBuf[i]=new DivDispatchOscBuffer;
}
if (!useAltASAP) {
MZPOKEYSND_Init(&pokey);
}
setFlags(flags);
reset();
return 6;
@ -498,9 +491,6 @@ void DivPlatformPOKEY::quit() {
for (int i=0; i<4; i++) {
delete oscBuf[i];
}
if (altASAP) {
delete altASAP;
}
}
void DivPlatformPOKEY::setAltASAP(bool value) {