From 48bb648ff92bb55a2b472949ea9de45b3e2dce0e Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Wed, 16 Feb 2011 02:42:58 +0000
Subject: [PATCH] IEmulator now has a string type so that emulators can return
 a string representing the platform they emulate

---
 BizHawk.Emulation/Consoles/Calculator/TI83.cs                | 4 ++++
 BizHawk.Emulation/Consoles/Gameboy/Input.cs                  | 5 +++++
 BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs        | 5 +++++
 BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs           | 5 +++++
 BizHawk.Emulation/Consoles/Sega/SMS/Input.cs                 | 5 +++++
 .../Interfaces/Base Implementations/NullEmulator.cs          | 5 +++++
 BizHawk.Emulation/Interfaces/IEmulator.cs                    | 2 ++
 BizHawk.MultiClient/RenderPanel.cs                           | 5 +++++
 8 files changed, 36 insertions(+)

diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
index de63fb08e0..c2a7d0ee89 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
@@ -27,6 +27,10 @@ namespace BizHawk.Emulation.Consoles.Calculator
 		bool m_CursorMoved;
 		//-------
 
+        public string type
+        {
+            get { return "TI83"; }
+        }
 
     	public byte ReadMemory(ushort addr)
         {
diff --git a/BizHawk.Emulation/Consoles/Gameboy/Input.cs b/BizHawk.Emulation/Consoles/Gameboy/Input.cs
index bf5d4a79b8..54a8500e7c 100644
--- a/BizHawk.Emulation/Consoles/Gameboy/Input.cs
+++ b/BizHawk.Emulation/Consoles/Gameboy/Input.cs
@@ -2,6 +2,11 @@
 {
     public partial class Gameboy
     {
+        public string type
+        {
+            get { return "GB"; }
+        }
+        
         public static readonly ControllerDefinition GbController = new ControllerDefinition
         {
             Name = "Gameboy Controller",
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs b/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs
index b081de7f1e..8fff8028f4 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs	
@@ -9,6 +9,11 @@
         // (ie, the IOBuffer)
         // However, I believe more fixes will be made in the future, and SF2 works, so this is not
         // currently a priority.
+        
+        public string type
+        {
+            get { return "PCE"; }
+        }
 
         private byte SF2MapperLatch;
 
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
index 33645b3249..be6ff21740 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
@@ -10,6 +10,11 @@ namespace BizHawk.Emulation.Consoles.Sega
 {
     public sealed partial class Genesis : IEmulator, IMemoryController
     {
+        public string type
+        {
+            get { return "GEN"; }
+        }
+        
         // ROM
         public byte[] RomData;
 
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/Input.cs b/BizHawk.Emulation/Consoles/Sega/SMS/Input.cs
index 76e19a97b3..e5499a16bc 100644
--- a/BizHawk.Emulation/Consoles/Sega/SMS/Input.cs
+++ b/BizHawk.Emulation/Consoles/Sega/SMS/Input.cs
@@ -13,6 +13,11 @@
                         }
             };
 
+        public string type
+        {
+            get { return "SMS"; }
+        }
+
         public ControllerDefinition ControllerDefinition { get { return SmsController;  } }
         public IController Controller { get; set; }
 
diff --git a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
index f7d7a922a7..3072deb427 100644
--- a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
+++ b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
@@ -6,6 +6,11 @@ namespace BizHawk
 {
     public class NullEmulator : IEmulator, IVideoProvider, ISoundProvider
     {
+        public string type
+        {
+            get { return "NULL"; }
+        }
+
         private static readonly ControllerDefinition NullController = new ControllerDefinition { Name = "Null Controller" };
 
         private int[] frameBuffer = new int[256 * 192];
diff --git a/BizHawk.Emulation/Interfaces/IEmulator.cs b/BizHawk.Emulation/Interfaces/IEmulator.cs
index 77a0b4c813..12699494e6 100644
--- a/BizHawk.Emulation/Interfaces/IEmulator.cs
+++ b/BizHawk.Emulation/Interfaces/IEmulator.cs
@@ -12,6 +12,8 @@ namespace BizHawk
         ControllerDefinition ControllerDefinition { get; }
         IController Controller { get; set; }
 
+        string type { get; }
+
         void LoadGame(IGame game);
         void FrameAdvance(bool render);
         
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index 23a32d2b3c..d923da6bb5 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -251,6 +251,11 @@ namespace BizHawk.MultiClient
             //TODO: If movie loaded use that frame counter, and also display total movie frame count if read-only
             if (Global.Config.DisplayFrameCounter)
                 MessageFont.DrawString(null, Global.Emulator.Frame.ToString(), 1, 1, new Color4(Color.White)); //TODO: Allow user to set screen coordinates?
+
+            if (Global.Config.DisplayInput)
+            {
+                
+            }
         }
 
         private List<UIMessage> messages = new List<UIMessage>(5);