From 8c10f401e261be36169d0edd1d739e5f7c7c16dd Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 1 Feb 2015 01:24:41 +0000
Subject: [PATCH] Octoshock - add controller type to ControllerSetting, with
 the options of GamePad, DualAnalog, Dualshock, still todo: wire it up to the
 UI, wire it up to the core

---
 .../Consoles/Sony/PSX/Octoshock.cs                | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 3943cbaa62..9ae218c093 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -944,14 +944,25 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 
 			public ControllerSetting[] Controllers = 
 			{
-				new ControllerSetting { IsConnected = true },
-				new ControllerSetting { IsConnected = false }
+				new ControllerSetting
+				{
+					IsConnected = true,
+					Type = ControllerSetting.ControllerType.DualShock
+				},
+				new ControllerSetting
+				{
+					IsConnected = false,
+					Type = ControllerSetting.ControllerType.DualShock
+				}
 			};
 		}
 
 		public class ControllerSetting
 		{
 			public bool IsConnected { get; set; }
+			public ControllerType Type { get; set; }
+
+			public enum ControllerType { Gamepad, DualAnalog, DualShock }
 		}
 
 		public class Settings