lifning/gpsp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get rid of gbc_sound_load_wave_ram macro

Browse source
This commit is contained in:
twinaphex 2014-12-09 19:13:35 +01:00
parent 109ba4d286
commit 01ac6359fd
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound.c
View file

@ -406,15 +406,6 @@ u32 gbc_sound_master_volume;
gs->sample_index = sample_index; \ gs->sample_index = sample_index; \
gs->tick_counter = tick_counter; \ gs->tick_counter = tick_counter; \
#define gbc_sound_load_wave_ram(bank) \
wave_bank = wave_samples + (bank * 32); \
for(i = 0, i2 = 0; i < 16; i++, i2 += 2) \
{ \
current_sample = wave_ram[i]; \
wave_bank[i2] = (((current_sample >> 4) & 0x0F) - 8); \
wave_bank[i2 + 1] = ((current_sample & 0x0F) - 8); \
} \
void update_gbc_sound(u32 cpu_ticks) void update_gbc_sound(u32 cpu_ticks)
{ {
fixed16_16 buffer_ticks = float_to_fp16_16((float)(cpu_ticks - fixed16_16 buffer_ticks = float_to_fp16_16((float)(cpu_ticks -
@ -464,10 +455,17 @@ void update_gbc_sound(u32 cpu_ticks)
gs = gbc_sound_channel + 2; gs = gbc_sound_channel + 2;
if(gbc_sound_wave_update) if(gbc_sound_wave_update)
{ {
unsigned to_load_wave_bank = (gs->wave_bank == 1) ? 1 : 0; unsigned bank = (gs->wave_bank == 1) ? 1 : 0;
gbc_sound_load_wave_ram(to_load_wave_bank);
gbc_sound_wave_update = 0; wave_bank = wave_samples + (bank * 32);
for(i = 0, i2 = 0; i < 16; i++, i2 += 2)
{
current_sample = wave_ram[i];
wave_bank[i2] = (((current_sample >> 4) & 0x0F) - 8);
wave_bank[i2 + 1] = ((current_sample & 0x0F) - 8);
}
gbc_sound_wave_update = 0;
} }
if((gs->active_flag) && (gs->master_enable)) if((gs->active_flag) && (gs->master_enable))