ControllerInterface: Implement dummy UpdateInput / UpdateOutputs

Make the implementation here a bit easier.
This commit is contained in:
Jasper St. Pierre 2014-11-13 00:53:24 -08:00
parent 0c056c6411
commit 367a42dcfd
10 changed files with 3 additions and 32 deletions

View File

@ -39,9 +39,6 @@ private:
}; };
public: public:
bool UpdateInput() { return true; }
bool UpdateOutput() { return true; }
Touchscreen(int padID); Touchscreen(int padID);
~Touchscreen() {} ~Touchscreen() {}

View File

@ -100,8 +100,8 @@ public:
virtual std::string GetName() const = 0; virtual std::string GetName() const = 0;
virtual int GetId() const = 0; virtual int GetId() const = 0;
virtual std::string GetSource() const = 0; virtual std::string GetSource() const = 0;
virtual bool UpdateInput() = 0; virtual bool UpdateInput() { return true; }
virtual bool UpdateOutput() = 0; virtual bool UpdateOutput() { return true; }
virtual void ClearInputState(); virtual void ClearInputState();

View File

@ -72,8 +72,6 @@ private:
}; };
public: public:
bool UpdateInput();
Joystick(IOHIDDeviceRef device, std::string name, int index); Joystick(IOHIDDeviceRef device, std::string name, int index);
~Joystick(); ~Joystick();

View File

@ -90,11 +90,6 @@ Joystick::~Joystick()
m_ff_device->Release(); m_ff_device->Release();
} }
bool Joystick::UpdateInput()
{
return true;
}
std::string Joystick::GetName() const std::string Joystick::GetName() const
{ {
return m_device_name; return m_device_name;

View File

@ -53,8 +53,7 @@ private:
}; };
public: public:
bool UpdateInput(); bool UpdateInput() override;
bool UpdateOutput();
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window); Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);

View File

@ -89,11 +89,6 @@ bool Keyboard::UpdateInput()
return true; return true;
} }
bool Keyboard::UpdateOutput()
{
return true;
}
std::string Keyboard::GetName() const std::string Keyboard::GetName() const
{ {
return m_device_name; return m_device_name;

View File

@ -286,11 +286,6 @@ bool KeyboardMouse::UpdateInput()
return true; return true;
} }
bool KeyboardMouse::UpdateOutput()
{
return true;
}
std::string KeyboardMouse::GetName() const std::string KeyboardMouse::GetName() const
{ {
// This is the name string we got from the X server for this master // This is the name string we got from the X server for this master

View File

@ -99,7 +99,6 @@ private:
public: public:
bool UpdateInput() override; bool UpdateInput() override;
bool UpdateOutput() override;
KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
~KeyboardMouse(); ~KeyboardMouse();

View File

@ -68,12 +68,6 @@ bool KeyboardMouse::UpdateInput()
return true; return true;
} }
bool KeyboardMouse::UpdateOutput()
{
return true;
}
std::string KeyboardMouse::GetName() const std::string KeyboardMouse::GetName() const
{ {
return "Keyboard Mouse"; return "Keyboard Mouse";

View File

@ -71,7 +71,6 @@ private:
public: public:
bool UpdateInput() override; bool UpdateInput() override;
bool UpdateOutput() override;
KeyboardMouse(Window window); KeyboardMouse(Window window);
~KeyboardMouse(); ~KeyboardMouse();