From f30dec819db55747ee142f27b10f57a4e96d37d8 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 4 Jun 2015 22:47:51 +0000
Subject: [PATCH] bl;ah blah

---
 .../Consoles/Nintendo/GBA/LibmGBA.cs          |  2 +-
 .../Consoles/Nintendo/GBA/MGBAHawk.cs         | 41 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
index 40898961ac..15ffeccd58 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
@@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		public static extern bool BizLoad(IntPtr ctx, byte[] data, int length);
 
 		[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);
 
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
index 3ba8871787..507fec1b2d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 namespace BizHawk.Emulation.Cores.Nintendo.GBA
 {
 	[CoreAttributes("mGBA", "endrift", true, false, "NOT DONE", "NOT DONE", false)]
-	public class MGBAHawk : IEmulator, IVideoProvider
+	public class MGBAHawk : IEmulator, IVideoProvider, ISyncSoundProvider
 	{
 		IntPtr core;
 
@@ -41,23 +41,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 
 		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 IController Controller { get; set; }
 
 		public void FrameAdvance(bool render, bool rendersound = true)
 		{
-			IntPtr vp = IntPtr.Zero;
-			LibmGBA.BizAdvance(core, 0, ref vp);
-			Marshal.Copy(vp, videobuff, 0, 240 * 160);
+			Frame++;
+			LibmGBA.BizAdvance(core, 0, videobuff, ref nsamp, soundbuff);
 		}
 
 		public int Frame { get; private set; }
@@ -70,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 
 		public void ResetCounters()
 		{
-			throw new NotImplementedException();
+			Frame = 0;
 		}
 
 		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 VirtualHeight { get { return 160; } }
 		public int BufferWidth { get { return 240; } }
 		public int BufferHeight { get { return 160; } }
-
 		public int BackgroundColor
 		{
 			get { return unchecked((int)0xff000000); }
 		}
-
 		public int[] GetVideoBuffer()
 		{
 			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
 	}
 }