mgba layer toggle

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs

@@ -60,5 +60,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		public static extern void BizGetState(IntPtr ctx, byte[] dest);
 		[DllImport(dll, CallingConvention = cc)]
 		public static extern bool BizPutState(IntPtr ctx, byte[] src);
+
+		[Flags]
+		public enum Layers : int
+		{
+			BG0 = 1,
+			BG1 = 2,
+			BG2 = 4,
+			BG3 = 8,
+			OBJ = 16
+		}
+
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void BizSetLayerMask(IntPtr ctx, Layers mask);
 	}
 }

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs

@@ -12,14 +12,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 {
 	[CoreAttributes("mGBA", "endrift", true, true, "0.4.0", "https://mgba.io/", false)]
 	[ServiceNotApplicable(typeof(IDriveLight), typeof(IRegionable))]
-	public class MGBAHawk : IEmulator, IVideoProvider, ISyncSoundProvider, IGBAGPUViewable, ISaveRam, IStatable, IInputPollable, ISettable<object, MGBAHawk.SyncSettings>
+	public class MGBAHawk : IEmulator, IVideoProvider, ISyncSoundProvider, IGBAGPUViewable, ISaveRam, IStatable, IInputPollable, ISettable<MGBAHawk.Settings, MGBAHawk.SyncSettings>
 	{
 		IntPtr core;
 
 		[CoreConstructor("GBA")]
-		public MGBAHawk(byte[] file, CoreComm comm, SyncSettings syncSettings, bool deterministic)
+		public MGBAHawk(byte[] file, CoreComm comm, SyncSettings syncSettings, Settings settings, bool deterministic)
 		{
 			_syncSettings = syncSettings ?? new SyncSettings();
+			_settings = settings ?? new Settings();
 			DeterministicEmulation = deterministic;
 
 			byte[] bios = comm.CoreFileProvider.GetFirmware("GBA", "Bios", false);
@@ -150,7 +151,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		{
 			nsamp = this.nsamp;
 			samples = soundbuff;
-			Console.WriteLine(nsamp);
 			DiscardSamples();
 		}
 		public void DiscardSamples()
@@ -391,9 +391,48 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			return basetime + increment;
 		}
 
-		public object GetSettings()
+		public Settings GetSettings()
 		{
-			return null;
+			return _settings.Clone();
+		}
+
+		public bool PutSettings(Settings o)
+		{
+			LibmGBA.Layers mask = 0;
+			if (o.DisplayBG0) mask |= LibmGBA.Layers.BG0;
+			if (o.DisplayBG1) mask |= LibmGBA.Layers.BG1;
+			if (o.DisplayBG2) mask |= LibmGBA.Layers.BG2;
+			if (o.DisplayBG3) mask |= LibmGBA.Layers.BG3;
+			if (o.DisplayOBJ) mask |= LibmGBA.Layers.OBJ;
+			LibmGBA.BizSetLayerMask(core, mask);
+			_settings = o;
+			return false;
+		}
+
+		private Settings _settings;
+
+		public class Settings
+		{
+			[DefaultValue(true)]
+			public bool DisplayBG0 { get; set; }
+			[DefaultValue(true)]
+			public bool DisplayBG1 { get; set; }
+			[DefaultValue(true)]
+			public bool DisplayBG2 { get; set; }
+			[DefaultValue(true)]
+			public bool DisplayBG3 { get; set; }
+			[DefaultValue(true)]
+			public bool DisplayOBJ { get; set; }
+
+			public Settings Clone()
+			{
+				return (Settings)MemberwiseClone();
+			}
+
+			public Settings()
+			{
+				SettingsUtil.SetDefaultValues(this);
+			}
 		}
 
 		public SyncSettings GetSyncSettings()
@@ -401,11 +440,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			return _syncSettings.Clone();
 		}
 
-		public bool PutSettings(object o)
-		{
-			return false;
-		}
-
 		public bool PutSyncSettings(SyncSettings o)
 		{
 			bool ret = SyncSettings.NeedsReboot(o, _syncSettings);