Merge pull request #604 from magcius/wip/emu-cleanup-2

Start cleaning up the input interface

1 files changed, 18 insertions, 0 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index a096bcb8b9..6e1868a4ba 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -42,6 +42,8 @@ public:
 		virtual std::string GetName() const = 0;
 		virtual ~Control() {}
 
+		bool InputGateOn();
+
 		virtual Input* ToInput() { return nullptr; }
 		virtual Output* ToOutput() { return nullptr; }
 	};
@@ -59,6 +61,16 @@ public:
 
 		virtual ControlState GetState() const = 0;
 
+		bool ShouldHaveInput();
+
+		ControlState GetGatedState()
+		{
+			if (InputGateOn())
+				return GetState();
+			else
+				return 0.0;
+		}
+
 		Input* ToInput() override { return this; }
 	};
 
@@ -74,6 +86,12 @@ public:
 
 		virtual void SetState(ControlState state) = 0;
 
+		void SetGatedState(ControlState state)
+		{
+			if (InputGateOn())
+				SetState(state);
+		}
+
 		Output* ToOutput() override { return this; }
 	};