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

PC speaker: add option to reset phase on freq chan

Browse source 
ge

some motherboards do so
This commit is contained in:
tildearrow 2024-01-11 14:50:53 -05:00
parent 8a14435b4a
commit 53c625354b
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/platform/pcspkr.cpp
View file

@ -373,6 +373,9 @@ void DivPlatformPCSpeaker::tick(bool sysTick) {
if (chan[i].keyOff) { if (chan[i].keyOff) {
on=false; on=false;
} }
if (freq!=chan[i].freq && resetPhase) {
pos=0;
}
freq=chan[i].freq; freq=chan[i].freq;
if (chan[i].keyOn) chan[i].keyOn=false; if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false; if (chan[i].keyOff) chan[i].keyOff=false;
@ -610,6 +613,7 @@ void DivPlatformPCSpeaker::setFlags(const DivConfig& flags) {
CHECK_CUSTOM_CLOCK; CHECK_CUSTOM_CLOCK;
rate=chipClock/PCSPKR_DIVIDER; rate=chipClock/PCSPKR_DIVIDER;
speakerType=flags.getInt("speakerType",0)&3; speakerType=flags.getInt("speakerType",0)&3;
resetPhase=flags.getBool("resetPhase",false);
oscBuf->rate=rate; oscBuf->rate=rate;
switch (speakerType) { switch (speakerType) {

2
src/engine/platform/pcspkr.h
View file

@ -51,7 +51,7 @@ class DivPlatformPCSpeaker: public DivDispatch {
FixedQueue<RealQueueVal,2048> realQueue; FixedQueue<RealQueueVal,2048> realQueue;
std::mutex realQueueLock; std::mutex realQueueLock;
bool isMuted[1]; bool isMuted[1];
bool on, flip, lastOn, realOutEnabled; bool on, flip, lastOn, realOutEnabled, resetPhase;
int pos, speakerType, beepFD, realOutMethod; int pos, speakerType, beepFD, realOutMethod;
float low, band; float low, band;
float low2, high2, band2; float low2, high2, band2;

6
src/gui/sysConf.cpp
View file

@ -997,6 +997,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
case DIV_SYSTEM_PCSPKR: { case DIV_SYSTEM_PCSPKR: {
int clockSel=flags.getInt("clockSel",0); int clockSel=flags.getInt("clockSel",0);
int speakerType=flags.getInt("speakerType",0); int speakerType=flags.getInt("speakerType",0);
bool resetPhase=flags.getBool("resetPhase",false);
ImGui::Text("Clock rate:"); ImGui::Text("Clock rate:");
ImGui::Indent(); ImGui::Indent();
@ -1034,10 +1035,15 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
} }
ImGui::Unindent(); ImGui::Unindent();
if (ImGui::Checkbox("Reset phase on frequency change",&resetPhase)) {
altered=true;
}
if (altered) { if (altered) {
e->lockSave([&]() { e->lockSave([&]() {
flags.set("clockSel",clockSel); flags.set("clockSel",clockSel);
flags.set("speakerType",speakerType); flags.set("speakerType",speakerType);
flags.set("resetPhase",resetPhase);
}); });
} }
break; break;