From a541b452311ac2548e365697c985cf4d830c1d4e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 28 Mar 2020 15:05:13 -0500
Subject: [PATCH] DS - refactoring

---
 .../Consoles/Nintendo/NDS/MelonDS.cs          |  2 +-
 .../Consoles/Nintendo/NDS/MelonDS_Settable.cs | 39 ++++++++++++++
 .../Nintendo/NDS/MelonDS_VideoProvider.cs     |  4 +-
 .../Nintendo/NDS/VIdeoScreenOptions.cs        | 53 -------------------
 4 files changed, 42 insertions(+), 56 deletions(-)
 delete mode 100644 BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/VIdeoScreenOptions.cs

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
index d8067d19f1..6415160e08 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
@@ -118,7 +118,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 			}
 		}
 
-		public Point? TouchScreenStart => _settings.ScreenOptions.TouchScreenStart();
+		public Point? TouchScreenStart => _settings.TouchScreenStart();
 
 		/// <summary>
 		/// MelonDS expects bios and firmware files at a specific location.
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
index c6ef75b8c9..93aa0c24e6 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.Text;
 using System.Runtime.InteropServices;
 
@@ -75,9 +76,47 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 		[DllImport(dllPath)]
 		private static extern uint GetTimeAtBoot();
 
+		public enum VideoScreenOptions
+		{
+			Default,
+			TopOnly,
+			SideBySideLR,
+			SideBySideRL
+			/* TODO Reverse */
+		}
+
 		public class MelonSettings
 		{
 			public VideoScreenOptions ScreenOptions { get; set; } = VideoScreenOptions.Default;
+
+			public Point? TouchScreenStart() =>
+				ScreenOptions switch
+				{
+					VideoScreenOptions.TopOnly => null,
+					VideoScreenOptions.SideBySideLR => new Point(NativeWidth, 0),
+					VideoScreenOptions.SideBySideRL => new Point(0, 0),
+					_ => new Point(0, NativeHeight)
+				};
+			
+
+			public int Width() =>
+				ScreenOptions switch
+				{
+					VideoScreenOptions.SideBySideLR => NativeWidth * 2,
+					VideoScreenOptions.SideBySideRL => NativeWidth * 2,
+					_ => NativeWidth
+				};
+			
+
+			// TODO: padding
+			public int Height() =>
+				ScreenOptions switch
+				{
+					VideoScreenOptions.TopOnly => NativeHeight,
+					VideoScreenOptions.SideBySideLR => NativeHeight,
+					VideoScreenOptions.SideBySideRL => NativeHeight,
+					_ => NativeHeight * 2
+				};
 		}
 
 		public class MelonSyncSettings
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
index 0045dade0b..4d6b9c276b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
@@ -16,8 +16,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 		public int VirtualWidth => BufferWidth;
 		public int VirtualHeight => BufferHeight;
 
-		public int BufferWidth => _settings.ScreenOptions.Width();
-		public int BufferHeight => _settings.ScreenOptions.Height();
+		public int BufferWidth => _settings.Width();
+		public int BufferHeight => _settings.Height();
 
 		public int VsyncNumerator => 60;
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/VIdeoScreenOptions.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/VIdeoScreenOptions.cs
deleted file mode 100644
index 67a43eefe5..0000000000
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/VIdeoScreenOptions.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Drawing;
-
-namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
-{
-	public enum VideoScreenOptions
-	{
-		Default, TopOnly, SideBySideLR, SideBySideRL /*, Reverse */
-	}
-
-	public static class VideoScreenOptionExtensions
-	{
-		public static Point? TouchScreenStart(this VideoScreenOptions option)
-		{
-			switch (option)
-			{
-				default:
-					return new Point(0, MelonDS.NativeHeight);
-				case VideoScreenOptions.TopOnly:
-					return null;
-				case VideoScreenOptions.SideBySideLR:
-					return new Point(MelonDS.NativeWidth, 0);
-				case VideoScreenOptions.SideBySideRL:
-					return new Point(0, 0);
-			}
-		}
-
-		public static int Width(this VideoScreenOptions option)
-		{
-			switch (option)
-			{
-				default:
-					return MelonDS.NativeWidth;
-				case VideoScreenOptions.SideBySideLR:
-				case VideoScreenOptions.SideBySideRL:
-					return MelonDS.NativeWidth * 2;
-			}
-		}
-
-		// TODO: padding
-		public static int Height(this VideoScreenOptions option)
-		{
-			switch (option)
-			{
-				default:
-					return MelonDS.NativeHeight * 2;
-				case VideoScreenOptions.TopOnly:
-				case VideoScreenOptions.SideBySideLR:
-				case VideoScreenOptions.SideBySideRL:
-					return MelonDS.NativeHeight;
-			}
-		}
-	}
-}