ShuriZma
/
SameBoy
mirror of https://github.com/LIJI32/SameBoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The previous change should only affect channel 3

This commit is contained in:
Lior Halphon 2023-12-15 20:52:24 +02:00
parent c7c2d08dc5
commit 6e923645d3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/apu.c
View File

@ -65,7 +65,6 @@ static uint8_t agb_bias_for_channel(GB_gameboy_t *gb, GB_channel_t index)
nodefault; nodefault;
} }
return 0;
} }
static void update_sample(GB_gameboy_t *gb, GB_channel_t index, int8_t value, unsigned cycles_offset) static void update_sample(GB_gameboy_t *gb, GB_channel_t index, int8_t value, unsigned cycles_offset)
@ -80,20 +79,22 @@ static void update_sample(GB_gameboy_t *gb, GB_channel_t index, int8_t value, un
if (gb->apu_output.sample_rate) { if (gb->apu_output.sample_rate) {
unsigned right_volume = (gb->io_registers[GB_IO_NR50] & 7) + 1; unsigned right_volume = (gb->io_registers[GB_IO_NR50] & 7) + 1;
unsigned left_volume = ((gb->io_registers[GB_IO_NR50] >> 4) & 7) + 1; unsigned left_volume = ((gb->io_registers[GB_IO_NR50] >> 4) & 7) + 1;
int8_t silence = 0;
if (index == GB_WAVE) { if (index == GB_WAVE) {
/* For some reason, channel 3 is inverted on the AGB */ /* For some reason, channel 3 is inverted on the AGB, and has a different "silence" value */
value ^= 0xF; value ^= 0xF;
silence = 7;
} }
GB_sample_t output;
uint8_t bias = agb_bias_for_channel(gb, index); uint8_t bias = agb_bias_for_channel(gb, index);
bool right = gb->io_registers[GB_IO_NR51] & (1 << index);
bool left = gb->io_registers[GB_IO_NR51] & (0x10 << index); bool left = gb->io_registers[GB_IO_NR51] & (0x10 << index);
bool right = gb->io_registers[GB_IO_NR51] & (1 << index);
output.right = (0xF - (right? value : 7) * 2 + bias) * right_volume; GB_sample_t output = {
output.left = (0xF - (left? value : 7) * 2 + bias) * left_volume; .left = (0xF - (left? value : silence) * 2 + bias) * left_volume,
.right = (0xF - (right? value : silence) * 2 + bias) * right_volume
};
if (unlikely(gb->apu_output.channel_muted[index])) { if (unlikely(gb->apu_output.channel_muted[index])) {
output.left = output.right = 0; output.left = output.right = 0;