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

garbodev: fix up all problems in the IEmulator sound binding. what you hear now, is what garbodev ACTUALLY SOUNDS LIKE. wow.

This commit is contained in:
goyuken 2012-12-10 20:11:10 +00:00
parent 4834f40f6c
commit 4784ab2006
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
BizHawk.Emulation/Consoles/Nintendo/GBAAlt/GbaManager.cs
View File

@ -12,7 +12,7 @@ namespace GarboDev
using BizHawk.Emulation; using BizHawk.Emulation;
using BizHawk; using BizHawk;
public class GbaManager : IEmulator, ISoundProvider, IVideoProvider public class GbaManager : IEmulator, ISyncSoundProvider, IVideoProvider
{ {
public const int cpuFreq = 16 * 1024 * 1024; public const int cpuFreq = 16 * 1024 * 1024;
@ -132,15 +132,6 @@ namespace GarboDev
this.videoManager.Reset(); this.videoManager.Reset();
} }
public void AudioMixerStereo(short[] buffer, int length)
{
// even = left, odd = right
if (this.soundManager.SamplesMixed > Math.Max(500, length))
{
this.soundManager.GetSamples(buffer, length);
}
}
public void LoadState(BinaryReader state) public void LoadState(BinaryReader state)
{ {
} }
@ -309,12 +300,12 @@ namespace GarboDev
ISoundProvider IEmulator.SoundProvider ISoundProvider IEmulator.SoundProvider
{ {
get { return this; } get { return null; }
} }
ISyncSoundProvider IEmulator.SyncSoundProvider ISyncSoundProvider IEmulator.SyncSoundProvider
{ {
get { return new FakeSyncSound(this, 735); } get { return this; }
} }
bool IEmulator.StartAsyncSound() bool IEmulator.StartAsyncSound()
@ -456,27 +447,23 @@ namespace GarboDev
} }
void ISoundProvider.GetSamples(short[] samples)
{
AudioMixerStereo(samples, samples.Length);
}
void ISoundProvider.DiscardSamples()
{
}
int ISoundProvider.MaxVolume
{
get;
set;
}
int[] vbuf = new int[240 * 160]; int[] vbuf = new int[240 * 160];
int[] IVideoProvider.GetVideoBuffer() { return vbuf; } int[] IVideoProvider.GetVideoBuffer() { return vbuf; }
int IVideoProvider.VirtualWidth { get { return 240; } } int IVideoProvider.VirtualWidth { get { return 240; } }
int IVideoProvider.BufferWidth { get { return 240; } } int IVideoProvider.BufferWidth { get { return 240; } }
int IVideoProvider.BufferHeight { get { return 160; } } int IVideoProvider.BufferHeight { get { return 160; } }
int IVideoProvider.BackgroundColor { get { return unchecked((int)0xff000000); } } int IVideoProvider.BackgroundColor { get { return unchecked((int)0xff000000); } }
void ISyncSoundProvider.GetSamples(out short[] samples, out int nsamp)
{
nsamp = soundManager.SamplesMixed / 2;
samples = new short[nsamp * 2];
soundManager.GetSamples(samples, nsamp * 2);
}
void ISyncSoundProvider.DiscardSamples()
{
// should implement
}
} }
} }