PVB
/
shrooms-vb-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Floogle's latest audio fixes

This commit is contained in:
Simon Gellis 2025-08-15 00:24:07 -04:00
parent 483714c0d6
commit 4ebdad0c2d
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/vsu.c
View File

@ -132,14 +132,19 @@ static void vsuEmulateChannel(VB *sim, Channel *chan) {
} }
/* Envelope modification */ /* Envelope modification */
if (chan->env.enb && !chan->env.modmask && chan->env.clocks == 0) { if (chan->env.clocks == 0) {
if (chan->env.dir == 0 && chan->env.value != 0) uint8_t new_envelope = chan->env.value;
chan->env.value--; if (chan->env.dir == 0 && chan->env.value != 0) {
else if (chan->env.dir == 1 && chan->env.value != 15) new_envelope--;
chan->env.value++; } else if (chan->env.dir == 1 && chan->env.value != 15) {
else if (chan->env.rep) new_envelope++;
chan->env.value = chan->env.reload; } else if (chan->env.rep && chan->env.modmask != 2) {
else chan->env.modmask = 1; new_envelope = chan->env.reload;
chan->env.modmask = 0;
} else if (!chan->env.modmask) chan->env.modmask = 1;
if (chan->env.enb && !chan->env.modmask) {
chan->env.value = new_envelope;
}
chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220; chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220;
} }
@ -215,6 +220,7 @@ static void vsuWriteEV0(VB *sim, int index, uint8_t value) {
chan->env.interval = value & 7; chan->env.interval = value & 7;
chan->env.value = value >> 4 & 15; chan->env.value = value >> 4 & 15;
chan->env.reload = chan->env.value; chan->env.reload = chan->env.value;
if (chan->env.modmask == 1) chan->env.modmask = 2;
if (index == 4) { if (index == 4) {
chan->freqmod = vsuCheckFreqMod(sim); chan->freqmod = vsuCheckFreqMod(sim);
vsuNextFreqMod(sim, chan); vsuNextFreqMod(sim, chan);
@ -231,6 +237,8 @@ static void vsuWriteEV1(VB *sim, int index, uint8_t value) {
/* Parse fields */ /* Parse fields */
chan->env.enb = value & 1; chan->env.enb = value & 1;
chan->env.rep = value >> 1 & 1; chan->env.rep = value >> 1 & 1;
if (!chan->env.rep && ((chan->env.reload == 0 && chan->env.dir == 0) || (chan->env.reload == 15 && chan->env.dir == 1)))
chan->env.modmask = 1;
/* Processing by channel */ /* Processing by channel */
switch (index) { switch (index) {
@ -286,8 +294,9 @@ static void vsuWriteINT(VB *sim, int index, uint8_t value) {
/* Update state */ /* Update state */
chan->int_.clocks = 76805 * ((uint32_t) chan->int_.interval + 1); chan->int_.clocks = 76805 * ((uint32_t) chan->int_.interval + 1);
chan->env.modmask = 0; chan->env.modmask = 0;
if (chan->env.enb) if (!chan->env.rep && ((chan->env.reload == 0 && chan->env.dir == 0) || (chan->env.reload == 15 && chan->env.dir == 1)))
chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1); chan->env.modmask = 1;
chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
if (index != 5) { if (index != 5) {
chan->wave.sample = 0; chan->wave.sample = 0;
chan->clocks = 4 * (2048 - (uint32_t) chan->freq.current); chan->clocks = 4 * (2048 - (uint32_t) chan->freq.current);
@ -377,7 +386,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
/* Clocks until next state change */ /* Clocks until next state change */
chan->until = chan->clocks; chan->until = chan->clocks;
if (chan->env.enb && !chan->env.modmask && if (chan->env.enb && chan->env.modmask != 2 &&
chan->env.clocks < chan->until) chan->env.clocks < chan->until)
chan->until = chan->env.clocks; chan->until = chan->env.clocks;
if (chan->int_.auto_ && chan->int_.clocks < chan->until) if (chan->int_.auto_ && chan->int_.clocks < chan->until)
@ -387,7 +396,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
/* Manage clocks */ /* Manage clocks */
chan->clocks -= chan->until; chan->clocks -= chan->until;
if (chan->env.enb && !chan->env.modmask) if (chan->env.enb && chan->env.modmask != 2)
chan->env.clocks -= chan->until; chan->env.clocks -= chan->until;
if (chan->int_.auto_) if (chan->int_.auto_)
chan->int_.clocks -= chan->until; chan->int_.clocks -= chan->until;