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

Disable reversed playback checkbox when using sample map 

Clamp per-channel OSC output, Reduce warning
This commit is contained in:
cam900 2022-05-02 21:19:10 +09:00
parent e246697928
commit 8283d46e7d
2 changed files with 6 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

@ -167,7 +167,7 @@ void DivPlatformES5506::acquire(short* bufL, short* bufR, size_t start, size_t l
bufL[h]=es5506.lout(0); bufL[h]=es5506.lout(0);
bufR[h]=es5506.rout(0); bufR[h]=es5506.rout(0);
for (int i=0; i<32; i++) { for (int i=0; i<32; i++) {
oscBuf[i]->data[oscBuf[i]->needle++]=chan[i].oscOut; oscBuf[i]->data[oscBuf[i]->needle++]=(short)(chan[i].oscOut&0xffff);
} }
} }
} }
@ -179,7 +179,7 @@ void DivPlatformES5506::e_pin(bool state)
if (es5506.voice_update()) { if (es5506.voice_update()) {
chan[prevChanCycle].lOut=es5506.voice_lout(prevChanCycle); chan[prevChanCycle].lOut=es5506.voice_lout(prevChanCycle);
chan[prevChanCycle].rOut=es5506.voice_rout(prevChanCycle); chan[prevChanCycle].rOut=es5506.voice_rout(prevChanCycle);
chan[prevChanCycle].oscOut=(chan[prevChanCycle].lOut+chan[prevChanCycle].rOut)>>5; chan[prevChanCycle].oscOut=CLAMP_VAL((chan[prevChanCycle].lOut+chan[prevChanCycle].rOut)>>5,-32768,32767);
if (es5506.voice_end()) { if (es5506.voice_end()) {
if (prevChanCycle<31) { if (prevChanCycle<31) {
for (int c=31; c>prevChanCycle; c--) { for (int c=31; c>prevChanCycle; c--) {
@ -404,11 +404,11 @@ void DivPlatformES5506::tick(bool sysTick) {
} }
} }
if (chan[i].std.ex8.had) { if (chan[i].std.ex8.had) {
if (chan[i].envelope.k1Slow!=(chan[i].std.ex8.val&1)) { if (chan[i].envelope.k1Slow!=(bool)(chan[i].std.ex8.val&1)) {
chan[i].envelope.k1Slow=chan[i].std.ex8.val&1; chan[i].envelope.k1Slow=chan[i].std.ex8.val&1;
chan[i].envChanged.k1Ramp=1; chan[i].envChanged.k1Ramp=1;
} }
if (chan[i].envelope.k2Slow!=(chan[i].std.ex8.val&2)) { if (chan[i].envelope.k2Slow!=(bool)(chan[i].std.ex8.val&2)) {
chan[i].envelope.k2Slow=chan[i].std.ex8.val&2; chan[i].envelope.k2Slow=chan[i].std.ex8.val&2;
chan[i].envChanged.k2Ramp=1; chan[i].envChanged.k2Ramp=1;
} }

2
src/gui/insEdit.cpp
View File

@ -2499,7 +2499,9 @@ void FurnaceGUI::drawInsEdit() {
} }
ImGui::EndCombo(); ImGui::EndCombo();
} }
ImGui::BeginDisabled(ins->amiga.useNoteMap||ins->amiga.useWave);
P(ImGui::Checkbox("Reversed playback",&ins->amiga.reversed)); P(ImGui::Checkbox("Reversed playback",&ins->amiga.reversed));
ImGui::EndDisabled();
P(ImGui::Checkbox("Use wavetable (Amiga only)",&ins->amiga.useWave)); P(ImGui::Checkbox("Use wavetable (Amiga only)",&ins->amiga.useWave));
if (ins->amiga.useWave) { if (ins->amiga.useWave) {
int len=ins->amiga.waveLen+1; int len=ins->amiga.waveLen+1;