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

SoundUnit: enough of bitfields, part 2

Browse source
This commit is contained in:
tildearrow 2023-02-06 14:14:50 -05:00
parent 63d0eb46a9
commit 0b2df4f7d4
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/engine/platform/sound/su.cpp
View file

@ -160,15 +160,15 @@ void SoundUnit::NextSample(short* l, short* r) {
if (chan[i].flags1&32) { if (chan[i].flags1&32) {
if (--swvolt[i]<=0) { if (--swvolt[i]<=0) {
swvolt[i]=chan[i].swvol.speed; swvolt[i]=chan[i].swvol.speed;
if (chan[i].swvol.dir) { if (chan[i].swvol.amt&32) {
chan[i].vol+=chan[i].swvol.amt; chan[i].vol+=chan[i].swvol.amt&31;
if (chan[i].vol>chan[i].swvol.bound && !chan[i].swvol.loop) { if (chan[i].vol>chan[i].swvol.bound && !(chan[i].swvol.amt&64)) {
chan[i].vol=chan[i].swvol.bound; chan[i].vol=chan[i].swvol.bound;
} }
if (chan[i].vol&0x80) { if (chan[i].vol&0x80) {
if (chan[i].swvol.loop) { if (chan[i].swvol.amt&64) {
if (chan[i].swvol.loopi) { if (chan[i].swvol.amt&128) {
chan[i].swvol.dir=!chan[i].swvol.dir; chan[i].swvol.amt^=32;
chan[i].vol=0xff-chan[i].vol; chan[i].vol=0xff-chan[i].vol;
} else { } else {
chan[i].vol&=~0x80; chan[i].vol&=~0x80;
@ -178,11 +178,11 @@ void SoundUnit::NextSample(short* l, short* r) {
} }
} }
} else { } else {
chan[i].vol-=chan[i].swvol.amt; chan[i].vol-=chan[i].swvol.amt&31;
if (chan[i].vol&0x80) { if (chan[i].vol&0x80) {
if (chan[i].swvol.loop) { if (chan[i].swvol.amt&64) {
if (chan[i].swvol.loopi) { if (chan[i].swvol.amt&128) {
chan[i].swvol.dir=!chan[i].swvol.dir; chan[i].swvol.amt^=32;
chan[i].vol=-chan[i].vol; chan[i].vol=-chan[i].vol;
} else { } else {
chan[i].vol&=~0x80; chan[i].vol&=~0x80;
@ -191,7 +191,7 @@ void SoundUnit::NextSample(short* l, short* r) {
chan[i].vol=0x0; chan[i].vol=0x0;
} }
} }
if (chan[i].vol<chan[i].swvol.bound && !chan[i].swvol.loop) { if (chan[i].vol<chan[i].swvol.bound && !(chan[i].swvol.amt&64)) {
chan[i].vol=chan[i].swvol.bound; chan[i].vol=chan[i].swvol.bound;
} }
} }
@ -200,20 +200,20 @@ void SoundUnit::NextSample(short* l, short* r) {
if (chan[i].flags1&16) { if (chan[i].flags1&16) {
if (--swfreqt[i]<=0) { if (--swfreqt[i]<=0) {
swfreqt[i]=chan[i].swfreq.speed; swfreqt[i]=chan[i].swfreq.speed;
if (chan[i].swfreq.dir) { if (chan[i].swfreq.amt&128) {
if (chan[i].freq>(0xffff-chan[i].swfreq.amt)) { if (chan[i].freq>(0xffff-(chan[i].swfreq.amt&127))) {
chan[i].freq=0xffff; chan[i].freq=0xffff;
} else { } else {
chan[i].freq=(chan[i].freq*(0x80+chan[i].swfreq.amt))>>7; chan[i].freq=(chan[i].freq*(0x80+(chan[i].swfreq.amt&127)))>>7;
if ((chan[i].freq>>8)>chan[i].swfreq.bound) { if ((chan[i].freq>>8)>chan[i].swfreq.bound) {
chan[i].freq=chan[i].swfreq.bound<<8; chan[i].freq=chan[i].swfreq.bound<<8;
} }
} }
} else { } else {
if (chan[i].freq<chan[i].swfreq.amt) { if (chan[i].freq<(chan[i].swfreq.amt&127)) {
chan[i].freq=0; chan[i].freq=0;
} else { } else {
chan[i].freq=(chan[i].freq*(0xff-chan[i].swfreq.amt))>>8; chan[i].freq=(chan[i].freq*(0xff-(chan[i].swfreq.amt&127)))>>8;
if ((chan[i].freq>>8)<chan[i].swfreq.bound) { if ((chan[i].freq>>8)<chan[i].swfreq.bound) {
chan[i].freq=chan[i].swfreq.bound<<8; chan[i].freq=chan[i].swfreq.bound<<8;
} }
@ -224,20 +224,20 @@ void SoundUnit::NextSample(short* l, short* r) {
if (chan[i].flags1&64) { if (chan[i].flags1&64) {
if (--swcutt[i]<=0) { if (--swcutt[i]<=0) {
swcutt[i]=chan[i].swcut.speed; swcutt[i]=chan[i].swcut.speed;
if (chan[i].swcut.dir) { if (chan[i].swcut.amt&128) {
if (chan[i].cutoff>(0xffff-chan[i].swcut.amt)) { if (chan[i].cutoff>(0xffff-(chan[i].swcut.amt&127))) {
chan[i].cutoff=0xffff; chan[i].cutoff=0xffff;
} else { } else {
chan[i].cutoff+=chan[i].swcut.amt; chan[i].cutoff+=chan[i].swcut.amt&127;
if ((chan[i].cutoff>>8)>chan[i].swcut.bound) { if ((chan[i].cutoff>>8)>chan[i].swcut.bound) {
chan[i].cutoff=chan[i].swcut.bound<<8; chan[i].cutoff=chan[i].swcut.bound<<8;
} }
} }
} else { } else {
if (chan[i].cutoff<chan[i].swcut.amt) { if (chan[i].cutoff<(chan[i].swcut.amt&127)) {
chan[i].cutoff=0; chan[i].cutoff=0;
} else { } else {
chan[i].cutoff=((2048-(unsigned int)chan[i].swcut.amt)*(unsigned int)chan[i].cutoff)>>11; chan[i].cutoff=((2048-(unsigned int)(chan[i].swcut.amt&127))*(unsigned int)chan[i].cutoff)>>11;
if ((chan[i].cutoff>>8)<chan[i].swcut.bound) { if ((chan[i].cutoff>>8)<chan[i].swcut.bound) {
chan[i].cutoff=chan[i].swcut.bound<<8; chan[i].cutoff=chan[i].swcut.bound<<8;
} }

11
src/engine/platform/sound/su.h
View file

@ -72,22 +72,17 @@ class SoundUnit {
unsigned short pcmrst; unsigned short pcmrst;
struct { struct {
unsigned short speed; unsigned short speed;
unsigned char amt: 7; unsigned char amt;
unsigned char dir: 1;
unsigned char bound; unsigned char bound;
} swfreq; } swfreq;
struct { struct {
unsigned short speed; unsigned short speed;
unsigned char amt: 5; unsigned char amt;
unsigned char dir: 1;
unsigned char loop: 1;
unsigned char loopi: 1;
unsigned char bound; unsigned char bound;
} swvol; } swvol;
struct { struct {
unsigned short speed; unsigned short speed;
unsigned char amt: 7; unsigned char amt;
unsigned char dir: 1;
unsigned char bound; unsigned char bound;
} swcut; } swcut;
unsigned char special1C; unsigned char special1C;