chris/Cog
2
1
Fork 0
Code Issues 64 Pull requests Projects Releases Packages Wiki Activity Actions

Fix NSF player to support N163 waveform lengths like the real thing

Browse source
This commit is contained in:
Christopher Snowhill 2020-03-24 01:11:02 -07:00
parent b7487e2ad2
commit 5fbf722f29
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Frameworks/GME/gme/Nes_Namco_Apu.cpp
View file

@ -36,7 +36,6 @@ void Nes_Namco_Apu::reset()
Namco_Osc& osc = oscs [i]; Namco_Osc& osc = oscs [i];
osc.delay = 0; osc.delay = 0;
osc.last_amp = 0; osc.last_amp = 0;
osc.wave_pos = 0;
} }
} }
@ -109,19 +108,17 @@ void Nes_Namco_Apu::run_until( blip_time_t nes_end_time )
blip_resampled_time_t period = blip_resampled_time_t period =
output->resampled_duration( lowest_freq_period / 8 ) / freq * 8 * active_oscs; output->resampled_duration( lowest_freq_period / 8 ) / freq * 8 * active_oscs;
int wave_size = 32 - (osc_reg [4] >> 2 & 7) * 4; int wave_size = 256 - (osc_reg [4] & 0xFC);
if ( !wave_size )
continue;
int last_amp = osc.last_amp; int last_amp = osc.last_amp;
int wave_pos = osc.wave_pos; int wave_pos = osc_reg [5] % wave_size;
output->set_modified(); output->set_modified();
do do
{ {
// read wave sample // read wave sample
int addr = wave_pos + osc_reg [6]; int addr = (wave_pos + osc_reg [6]) & 0xFF;
int sample = reg [addr >> 1] >> (addr << 2 & 4); int sample = reg [addr >> 1] >> (addr << 2 & 4);
wave_pos++; wave_pos++;
sample = (sample & 15) * volume; sample = (sample & 15) * volume;
@ -141,7 +138,7 @@ void Nes_Namco_Apu::run_until( blip_time_t nes_end_time )
} }
while ( time < end_time ); while ( time < end_time );
osc.wave_pos = wave_pos; ((BOOST::uint8_t*)osc_reg)[5] = wave_pos;
osc.last_amp = last_amp; osc.last_amp = last_amp;
} }
osc.delay = time - end_time; osc.delay = time - end_time;

1
Frameworks/GME/gme/Nes_Namco_Apu.h
View file

@ -45,7 +45,6 @@ private:
int delay; int delay;
Blip_Buffer* output; Blip_Buffer* output;
short last_amp; short last_amp;
short wave_pos;
}; };
Namco_Osc oscs [osc_count]; Namco_Osc oscs [osc_count];