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

Detect duration for note_off as well as note_on.

This commit is contained in:
~d6 2023-10-20 12:24:39 -04:00 committed by neauoire
parent 87d6798593
commit dbf1c72f21
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/audio.c
View File

@ -112,9 +112,9 @@ env_off(Envelope *env)
} }
void void
note_on(AudioChannel *channel, Uint16 duration, Uint8 *data, Uint16 len, Uint8 vol, Uint8 attack, Uint8 decay, Uint8 sustain, Uint8 release, Uint8 pitch, bool loop) note_on(AudioChannel *channel, float duration, Uint8 *data, Uint16 len, Uint8 vol, Uint8 attack, Uint8 decay, Uint8 sustain, Uint8 release, Uint8 pitch, bool loop)
{ {
channel->duration = duration > 0 ? duration : len / 44.1f; channel->duration = duration;
channel->vol_l = (vol >> 4) / 15.0f; channel->vol_l = (vol >> 4) / 15.0f;
channel->vol_r = (vol & 0xf) / 15.0f; channel->vol_r = (vol & 0xf) / 15.0f;
@ -147,7 +147,7 @@ note_on(AudioChannel *channel, Uint16 duration, Uint8 *data, Uint16 len, Uint8 v
} }
void void
note_off(AudioChannel *channel, Uint16 duration) note_off(AudioChannel *channel, float duration)
{ {
channel->duration = duration; channel->duration = duration;
env_off(&channel->sample.env); env_off(&channel->sample.env);
@ -294,13 +294,14 @@ audio_handler(void *ctx, Uint8 *out_stream, int len)
void void
audio_start(int idx, Uint8 *d, Uxn *u) audio_start(int idx, Uint8 *d, Uxn *u)
{ {
Uint16 duration = PEEK2(d + 0x5); Uint16 dur = PEEK2(d + 0x5);
Uint8 off = d[0xf] == 0x00; Uint8 off = d[0xf] == 0x00;
Uint16 len = PEEK2(d + 0xa);
float duration = dur > 0 ? dur : len / 44.1f;
if(!off) { if(!off) {
Uint16 addr = PEEK2(d + 0xc); Uint16 addr = PEEK2(d + 0xc);
Uint8 *data = &u->ram[addr]; Uint8 *data = &u->ram[addr];
Uint16 len = PEEK2(d + 0xa);
Uint8 volume = d[0xe]; Uint8 volume = d[0xe];
bool loop = !(d[0xf] & 0x80); bool loop = !(d[0xf] & 0x80);
Uint8 pitch = d[0xf] & 0x7f; Uint8 pitch = d[0xf] & 0x7f;