d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take pitch into account when computing duration.

This commit is contained in:
~d6 2023-10-20 19:38:01 -04:00 committed by neauoire
parent dbf1c72f21
commit 6a091365a2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/audio.c
View File

@ -291,20 +291,27 @@ audio_handler(void *ctx, Uint8 *out_stream, int len)
} }
} }
float
calc_duration(Uint16 len, Uint8 pitch)
{
float scale = tuning[pitch - 20] / tuning[0x3c - 20];
return len / (scale * 44.1f);
}
void void
audio_start(int idx, Uint8 *d, Uxn *u) audio_start(int idx, Uint8 *d, Uxn *u)
{ {
Uint16 dur = PEEK2(d + 0x5); Uint16 dur = PEEK2(d + 0x5);
Uint8 off = d[0xf] == 0x00; Uint8 off = d[0xf] == 0x00;
Uint16 len = PEEK2(d + 0xa); Uint16 len = PEEK2(d + 0xa);
float duration = dur > 0 ? dur : len / 44.1f; Uint8 pitch = d[0xf] & 0x7f;
float duration = dur > 0 ? dur : calc_duration(len, pitch);
if(!off) { if(!off) {
Uint16 addr = PEEK2(d + 0xc); Uint16 addr = PEEK2(d + 0xc);
Uint8 *data = &u->ram[addr]; Uint8 *data = &u->ram[addr];
Uint8 volume = d[0xe]; Uint8 volume = d[0xe];
bool loop = !(d[0xf] & 0x80); bool loop = !(d[0xf] & 0x80);
Uint8 pitch = d[0xf] & 0x7f;
Uint16 adsr = PEEK2(d + 0x8); Uint16 adsr = PEEK2(d + 0x8);
Uint8 attack = (adsr >> 12) & 0xF; Uint8 attack = (adsr >> 12) & 0xF;
Uint8 decay = (adsr >> 8) & 0xF; Uint8 decay = (adsr >> 8) & 0xF;