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

Volumes no longer doubles

Browse Source
This commit is contained in:
Lior Halphon 2016-09-20 19:58:30 +03:00
parent 4beb946468
commit 37e895352f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/apu.c
View File

@ -177,8 +177,8 @@ void GB_apu_get_samples_and_update_pcm_regs(GB_gameboy_t *gb, GB_sample_t *sampl
gb->io_registers[GB_IO_PCM_34] |= (((int)sample) * 0xF / MAX_CH_AMP) << 4; gb->io_registers[GB_IO_PCM_34] |= (((int)sample) * 0xF / MAX_CH_AMP) << 4;
} }
samples->left *= gb->apu.left_volume; samples->left = (int) samples->left * gb->apu.left_volume / 7;
samples->right *= gb->apu.right_volume; samples->right = (int) samples->right * gb->apu.right_volume / 7;
} }
void GB_apu_run(GB_gameboy_t *gb) void GB_apu_run(GB_gameboy_t *gb)
@ -232,8 +232,8 @@ void GB_apu_init(GB_gameboy_t *gb)
memset(&gb->apu, 0, sizeof(gb->apu)); memset(&gb->apu, 0, sizeof(gb->apu));
gb->apu.wave_channels[0].duty = gb->apu.wave_channels[1].duty = 4; gb->apu.wave_channels[0].duty = gb->apu.wave_channels[1].duty = 4;
gb->apu.lfsr = 0x7FFF; gb->apu.lfsr = 0x7FFF;
gb->apu.left_volume = 1.0; gb->apu.left_volume = 7;
gb->apu.right_volume = 1.0; gb->apu.right_volume = 7;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
gb->apu.wave_channels[i].left_on = gb->apu.wave_channels[i].right_on = 1; gb->apu.wave_channels[i].left_on = gb->apu.wave_channels[i].right_on = 1;
} }
@ -410,8 +410,8 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
break; break;
case GB_IO_NR50: case GB_IO_NR50:
gb->apu.left_volume = (value & 7) / 7.0; gb->apu.left_volume = (value & 7);
gb->apu.right_volume = ((value >> 4) & 7) / 7.0; gb->apu.right_volume = ((value >> 4) & 7);
break; break;
case GB_IO_NR51: case GB_IO_NR51:

4
Core/apu.h
View File

@ -53,8 +53,8 @@ typedef struct
bool wave_enable; bool wave_enable;
uint16_t lfsr; uint16_t lfsr;
bool lfsr_7_bit; bool lfsr_7_bit;
double left_volume; uint8_t left_volume;
double right_volume; uint8_t right_volume;
GB_apu_channel_t wave_channels[4]; GB_apu_channel_t wave_channels[4];
} GB_apu_t; } GB_apu_t;