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

[NES] fix some annoying sound bugs

This commit is contained in:
zeromus 2011-03-20 03:32:43 +00:00
parent 6493b65690
commit a62b3009ef
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
View File

@ -238,6 +238,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
case 1: break; case 1: break;
case 2: case 2:
timer_cnt = (timer_cnt & ~0xFF) | val; timer_cnt = (timer_cnt & ~0xFF) | val;
timer_cnt_reload = timer_cnt + 1;
break; break;
case 3: case 3:
timer_cnt = (timer_cnt & 0xFF) | ((val & 0x7) << 8); timer_cnt = (timer_cnt & 0xFF) | ((val & 0x7) << 8);
@ -246,6 +247,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
halt_flag = 1; halt_flag = 1;
break; break;
} }
//Console.WriteLine("tri timer_reload_value: {0}", timer_cnt_reload);
} }
int linear_counter, timer, timer_cnt_reload; int linear_counter, timer, timer_cnt_reload;
@ -265,19 +267,17 @@ namespace BizHawk.Emulation.Consoles.Nintendo
//is clocked in frame counter. //is clocked in frame counter.
if (en) if (en)
{ {
timer--; if(timer>0) timer--;
if (timer == 0) if (timer == 0)
{ {
seq = (seq + 1) & 0x1F; seq = (seq + 1) & 0x1F;
timer = timer_cnt_reload; timer = timer_cnt_reload;
} }
if(CFG_DECLICK) //if(CFG_DECLICK)
sample = TRIANGLE_TABLE[(seq+8)&0x1F]; // sample = TRIANGLE_TABLE[(seq+8)&0x1F];
else //else
sample = TRIANGLE_TABLE[seq]; sample = TRIANGLE_TABLE[seq];
} }
else
sample = 0;
} }
@ -290,7 +290,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
// Console.WriteLine("linear_counter: {0}", linear_counter); // Console.WriteLine("linear_counter: {0}", linear_counter);
if (halt_flag == 1) if (halt_flag == 1)
{ {
timer = timer_cnt_reload;
linear_counter = linear_counter_reload; linear_counter = linear_counter_reload;
} }
else if (linear_counter != 0) else if (linear_counter != 0)
@ -459,8 +458,18 @@ namespace BizHawk.Emulation.Consoles.Nintendo
double timer; double timer;
Queue<int> squeue = new Queue<int>(); Queue<int> squeue = new Queue<int>();
int last_hwsamp; int last_hwsamp;
int panic_sample, panic_count;
void EmitSample(int samp) void EmitSample(int samp)
{ {
//kill the annoying hum that is a consequence of the shitty code below
if (samp == panic_sample)
panic_count++;
else panic_count = 0;
if (panic_count > 178977)
samp = 0;
else
panic_sample = samp;
int this_samp = samp; int this_samp = samp;
const double kMixRate = 44100.0/1789772.0; const double kMixRate = 44100.0/1789772.0;
const double kInvMixRate = (1 / kMixRate); const double kInvMixRate = (1 / kMixRate);
@ -490,8 +499,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo
void ISoundProvider.GetSamples(short[] samples) void ISoundProvider.GetSamples(short[] samples)
{ {
if(CFG_USE_METASPU) if (CFG_USE_METASPU)
{
metaspu.GetSamples(samples); metaspu.GetSamples(samples);
//foreach(short sample in samples) bw.Write((short)sample);
}
else else
MyGetSamples(samples); MyGetSamples(samples);
} }

2
BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
View File

@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public partial class NES : IEmulator public partial class NES : IEmulator
{ {
static readonly bool USE_DATABASE = false; static readonly bool USE_DATABASE = true;
//Game issues: //Game issues:
//3-D World Runner - UNROM - weird lines in gameplay (scanlines off?) //3-D World Runner - UNROM - weird lines in gameplay (scanlines off?)

2
BizHawk.MultiClient/Config.cs
View File

@ -181,7 +181,7 @@
//GameBoy Settings //GameBoy Settings
public NESControllerTemplate GameBoyController = new NESControllerTemplate(true); public NESControllerTemplate GameBoyController = new NESControllerTemplate(true);
public string NESReset = "Tab"; public string NESReset = "Backspace";
public NESControllerTemplate[] NESController = new NESControllerTemplate[4]; public NESControllerTemplate[] NESController = new NESControllerTemplate[4];
} }