Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed an APU issue that might occur when having more than one GB_gameboy_t object

Browse Source
This commit is contained in:
Lior Halphon 2016-09-06 22:36:16 +03:00
parent ae003ee020
commit 01fc137256
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/apu.c
View File

@ -271,7 +271,6 @@ uint8_t GB_apu_read(GB_gameboy_t *gb, uint8_t reg)
void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value) void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
{ {
static const double duties[] = {0.125, 0.25, 0.5, 0.75}; static const double duties[] = {0.125, 0.25, 0.5, 0.75};
static uint16_t NRX3_X4_temp[3] = {0};
uint8_t channel = 0; uint8_t channel = 0;
if (!gb->apu.global_enable && reg != GB_IO_NR52) { if (!gb->apu.global_enable && reg != GB_IO_NR52) {
@ -336,8 +335,8 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
case GB_IO_NR13: case GB_IO_NR13:
case GB_IO_NR23: case GB_IO_NR23:
case GB_IO_NR33: case GB_IO_NR33:
NRX3_X4_temp[channel] = (NRX3_X4_temp[channel] & 0xFF00) | value; gb->apu.NRX3_X4_temp[channel] = (gb->apu.NRX3_X4_temp[channel] & 0xFF00) | value;
gb->apu.wave_channels[channel].frequency = 131072.0 / (2048 - NRX3_X4_temp[channel]); gb->apu.wave_channels[channel].frequency = 131072.0 / (2048 - gb->apu.NRX3_X4_temp[channel]);
if (channel == 2) { if (channel == 2) {
gb->apu.wave_channels[channel].frequency /= 2; gb->apu.wave_channels[channel].frequency /= 2;
} }
@ -353,8 +352,8 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
gb->apu.wave_channels[channel].cur_envelope_steps = gb->apu.wave_channels[channel].envelope_steps; gb->apu.wave_channels[channel].cur_envelope_steps = gb->apu.wave_channels[channel].envelope_steps;
} }
NRX3_X4_temp[channel] = (NRX3_X4_temp[channel] & 0xFF) | ((value & 0x7) << 8); gb->apu.NRX3_X4_temp[channel] = (gb->apu.NRX3_X4_temp[channel] & 0xFF) | ((value & 0x7) << 8);
gb->apu.wave_channels[channel].frequency = 131072.0 / (2048 - NRX3_X4_temp[channel]); gb->apu.wave_channels[channel].frequency = 131072.0 / (2048 - gb->apu.NRX3_X4_temp[channel]);
if (channel == 2) { if (channel == 2) {
gb->apu.wave_channels[channel].frequency /= 2; gb->apu.wave_channels[channel].frequency /= 2;
} }

1
Core/apu.h
View File

@ -53,6 +53,7 @@ typedef struct
bool left_on[4]; bool left_on[4];
bool right_on[4]; bool right_on[4];
bool global_enable; bool global_enable;
uint16_t NRX3_X4_temp[3];
} GB_apu_t; } GB_apu_t;
void GB_apu_render(GB_gameboy_t *gb, unsigned int sample_rate, unsigned int n_samples, GB_sample_t *samples); void GB_apu_render(GB_gameboy_t *gb, unsigned int sample_rate, unsigned int n_samples, GB_sample_t *samples);