piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

ControllerInterface: Don't pass m_devices to the backends

Browse Source 
Previously, the devices vector would be passed to all backends. They
would then manually push_back to it to add new devices. This was fine
but caused issues when trying to add synchronisation.

Instead, backends now call AddDevice() to fill m_devices so that it is
not accessible from the outside.
This commit is contained in:
Léo Lam
2016-06-12 17:08:04 +02:00
parent 8a1bbaa563
commit fd29e5c4cc
24 changed files with 69 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
View File

@ -46,7 +46,7 @@ namespace ciface
namespace XInput2
{
// This function will add zero or more KeyboardMouse objects to devices.
void Init(std::vector<Core::Device*>& devices, void* const hwnd)
void Init(void* const hwnd)
{
Display* dpy = XOpenDisplay(nullptr);
@ -78,8 +78,8 @@ void Init(std::vector<Core::Device*>& devices, void* const hwnd)
if (current_master->use == XIMasterPointer)
// Since current_master is a master pointer, its attachment must
// be a master keyboard.
devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid,
current_master->attachment));
g_controller_interface.AddDevice(new KeyboardMouse(
(Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment));
}
XCloseDisplay(dpy);

4
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
View File

@ -12,13 +12,13 @@ extern "C" {
#include <X11/keysym.h>
}
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace ciface
{
namespace XInput2
{
void Init(std::vector<Core::Device*>& devices, void* const hwnd);
void Init(void* const hwnd);
class KeyboardMouse : public Core::Device
{

4
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
View File

@ -11,9 +11,9 @@ namespace ciface
{
namespace Xlib
{
void Init(std::vector<Core::Device*>& devices, void* const hwnd)
void Init(void* const hwnd)
{
devices.push_back(new KeyboardMouse((Window)hwnd));
g_controller_interface.AddDevice(new KeyboardMouse((Window)hwnd));
}
KeyboardMouse::KeyboardMouse(Window window) : m_window(window)

4
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
View File

@ -7,13 +7,13 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace ciface
{
namespace Xlib
{
void Init(std::vector<Core::Device*>& devices, void* const hwnd);
void Init(void* const hwnd);
class KeyboardMouse : public Core::Device
{