From 367a42dcfdf61e5fcd3e3444190ed25d4d8fc114 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 13 Nov 2014 00:53:24 -0800
Subject: [PATCH] ControllerInterface: Implement dummy UpdateInput /
UpdateOutputs
Make the implementation here a bit easier.
---
.../Core/InputCommon/ControllerInterface/Android/Android.h | 3 ---
Source/Core/InputCommon/ControllerInterface/Device.h | 4 ++--
.../Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h | 2 --
.../Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm | 5 -----
.../Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h | 3 +--
.../Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm | 5 -----
.../Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 5 -----
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 1 -
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp | 6 ------
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h | 1 -
10 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index 309f42e604..5d6767aa03 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -39,9 +39,6 @@ private:
};
public:
- bool UpdateInput() { return true; }
- bool UpdateOutput() { return true; }
-
Touchscreen(int padID);
~Touchscreen() {}
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index c23c0d29bf..6b9c0d2994 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -100,8 +100,8 @@ public:
virtual std::string GetName() const = 0;
virtual int GetId() const = 0;
virtual std::string GetSource() const = 0;
- virtual bool UpdateInput() = 0;
- virtual bool UpdateOutput() = 0;
+ virtual bool UpdateInput() { return true; }
+ virtual bool UpdateOutput() { return true; }
virtual void ClearInputState();
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index ffbe475840..728d55dde8 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -72,8 +72,6 @@ private:
};
public:
- bool UpdateInput();
-
Joystick(IOHIDDeviceRef device, std::string name, int index);
~Joystick();
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index 93dea13c28..bdba40c410 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -90,11 +90,6 @@ Joystick::~Joystick()
m_ff_device->Release();
}
-bool Joystick::UpdateInput()
-{
- return true;
-}
-
std::string Joystick::GetName() const
{
return m_device_name;
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index 36705075ee..c38235c2b8 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -53,8 +53,7 @@ private:
};
public:
- bool UpdateInput();
- bool UpdateOutput();
+ bool UpdateInput() override;
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
index 1294346e1b..5a97b27488 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
@@ -89,11 +89,6 @@ bool Keyboard::UpdateInput()
return true;
}
-bool Keyboard::UpdateOutput()
-{
- return true;
-}
-
std::string Keyboard::GetName() const
{
return m_device_name;
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 13ace15997..4d7cc26b4d 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -286,11 +286,6 @@ bool KeyboardMouse::UpdateInput()
return true;
}
-bool KeyboardMouse::UpdateOutput()
-{
- return true;
-}
-
std::string KeyboardMouse::GetName() const
{
// This is the name string we got from the X server for this master
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index a75c74bba5..064dd997f7 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -99,7 +99,6 @@ private:
public:
bool UpdateInput() override;
- bool UpdateOutput() override;
KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
~KeyboardMouse();
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
index 973368a78e..e938cfc1bc 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -68,12 +68,6 @@ bool KeyboardMouse::UpdateInput()
return true;
}
-bool KeyboardMouse::UpdateOutput()
-{
- return true;
-}
-
-
std::string KeyboardMouse::GetName() const
{
return "Keyboard Mouse";
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
index 237b3a484e..61d520d08c 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
@@ -71,7 +71,6 @@ private:
public:
bool UpdateInput() override;
- bool UpdateOutput() override;
KeyboardMouse(Window window);
~KeyboardMouse();