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

7800: clean up some sound-related stuff

This commit is contained in:
goyuken 2012-12-12 16:24:14 +00:00
parent 0636bda89d
commit faceb7e18d
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
View File

@ -32,6 +32,7 @@ namespace BizHawk
} }
avProvider.FillFrameBuffer(); avProvider.FillFrameBuffer();
} }
/* TODO */ /* TODO */
@ -251,13 +252,19 @@ namespace BizHawk
BufferHeight = framebuffer.Scanlines; BufferHeight = framebuffer.Scanlines;
vidbuffer = new int[BufferWidth * BufferHeight]; vidbuffer = new int[BufferWidth * BufferHeight];
uint samplerate = (uint)m.SoundSampleFrequency; uint newsamplerate = (uint)m.SoundSampleFrequency;
if (resampler != null) if (newsamplerate != samplerate)
resampler.Dispose(); {
resampler = new Emulation.Sound.Utilities.SpeexResampler(3, samplerate, 44100, samplerate, 44100, null, null); // really shouldn't happen, but if it does, we're ready
dcfilter = Emulation.Sound.Utilities.DCFilter.DetatchedMode(256); if (resampler != null)
resampler.Dispose();
resampler = new Emulation.Sound.Utilities.SpeexResampler(3, newsamplerate, 44100, newsamplerate, 44100, null, null);
samplerate = newsamplerate;
dcfilter = Emulation.Sound.Utilities.DCFilter.DetatchedMode(256);
}
} }
uint samplerate;
int[] vidbuffer; int[] vidbuffer;
Emulation.Sound.Utilities.SpeexResampler resampler; Emulation.Sound.Utilities.SpeexResampler resampler;
Emulation.Sound.Utilities.DCFilter dcfilter; Emulation.Sound.Utilities.DCFilter dcfilter;
@ -304,7 +311,9 @@ namespace BizHawk
byte* src = (byte*)src_; byte* src = (byte*)src_;
for (int i = 0; i < nsampin; i++) for (int i = 0; i < nsampin; i++)
{ {
short s = (short)(src[i] * 200 - 25500); // the buffer values don't really get very large at all,
// so this doesn't overflow
short s = (short)(src[i] * 200);
resampler.EnqueueSample(s, s); resampler.EnqueueSample(s, s);
} }
@ -316,7 +325,8 @@ namespace BizHawk
public void DiscardSamples() public void DiscardSamples()
{ {
resampler.DiscardSamples(); if (resampler != null)
resampler.DiscardSamples();
} }
public void Dispose() public void Dispose()