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

bl;ah blah

This commit is contained in:
goyuken 2015-06-04 22:47:51 +00:00
parent 66f0bf15c0
commit f30dec819d
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public static extern bool BizLoad(IntPtr ctx, byte[] data, int length); public static extern bool BizLoad(IntPtr ctx, byte[] data, int length);
[DllImport(dll, CallingConvention = cc)] [DllImport(dll, CallingConvention = cc)]
public static extern void BizAdvance(IntPtr ctx, int keys, ref IntPtr vbuff); public static extern void BizAdvance(IntPtr ctx, int keys, int[] vbuff, ref int nsamp, short[] sbuff);
} }
} }

41
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Cores.Nintendo.GBA namespace BizHawk.Emulation.Cores.Nintendo.GBA
{ {
[CoreAttributes("mGBA", "endrift", true, false, "NOT DONE", "NOT DONE", false)] [CoreAttributes("mGBA", "endrift", true, false, "NOT DONE", "NOT DONE", false)]
public class MGBAHawk : IEmulator, IVideoProvider public class MGBAHawk : IEmulator, IVideoProvider, ISyncSoundProvider
{ {
IntPtr core; IntPtr core;
@ -41,23 +41,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public IEmulatorServiceProvider ServiceProvider { get; private set; } public IEmulatorServiceProvider ServiceProvider { get; private set; }
public ISoundProvider SoundProvider { get { throw new InvalidOperationException(); } }
public ISyncSoundProvider SyncSoundProvider { get { return new FakeSyncSound(new NullSound(), 735); } }
public bool StartAsyncSound() { return false; }
public void EndAsyncSound() { }
public ControllerDefinition ControllerDefinition { get { return GBA.GBAController; } } public ControllerDefinition ControllerDefinition { get { return GBA.GBAController; } }
public IController Controller { get; set; } public IController Controller { get; set; }
public void FrameAdvance(bool render, bool rendersound = true) public void FrameAdvance(bool render, bool rendersound = true)
{ {
IntPtr vp = IntPtr.Zero; Frame++;
LibmGBA.BizAdvance(core, 0, ref vp); LibmGBA.BizAdvance(core, 0, videobuff, ref nsamp, soundbuff);
Marshal.Copy(vp, videobuff, 0, 240 * 160);
} }
public int Frame { get; private set; } public int Frame { get; private set; }
@ -70,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public void ResetCounters() public void ResetCounters()
{ {
throw new NotImplementedException(); Frame = 0;
} }
public CoreComm CoreComm { get; private set; } public CoreComm CoreComm { get; private set; }
@ -84,21 +75,39 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
} }
} }
#region IVideoProvider
public int VirtualWidth { get { return 240; } } public int VirtualWidth { get { return 240; } }
public int VirtualHeight { get { return 160; } } public int VirtualHeight { get { return 160; } }
public int BufferWidth { get { return 240; } } public int BufferWidth { get { return 240; } }
public int BufferHeight { get { return 160; } } public int BufferHeight { get { return 160; } }
public int BackgroundColor public int BackgroundColor
{ {
get { return unchecked((int)0xff000000); } get { return unchecked((int)0xff000000); }
} }
public int[] GetVideoBuffer() public int[] GetVideoBuffer()
{ {
return videobuff; return videobuff;
} }
private readonly int[] videobuff = new int[240 * 160];
#endregion
private int[] videobuff = new int[240 * 160]; #region ISoundProvider
private readonly short[] soundbuff = new short[2048];
private int nsamp;
public void GetSamples(out short[] samples, out int nsamp)
{
nsamp = this.nsamp;
samples = soundbuff;
DiscardSamples();
}
public void DiscardSamples()
{
nsamp = 0;
}
public ISoundProvider SoundProvider { get { throw new InvalidOperationException(); } }
public ISyncSoundProvider SyncSoundProvider { get { return this; } }
public bool StartAsyncSound() { return false; }
public void EndAsyncSound() { }
#endregion
} }
} }