artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix unnecessary diffs

Browse source
This commit is contained in:
Ameer 2020-07-02 16:51:16 -04:00
parent 6b7c8e469b
commit 6e1639c7b0
4 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/input_common/keyboard.cpp
View file

@ -49,11 +49,10 @@ public:
void ChangeKeyStatus(int key_code, bool pressed) { void ChangeKeyStatus(int key_code, bool pressed) {
std::lock_guard guard{mutex}; std::lock_guard guard{mutex};
for (const KeyButtonPair& pair : list) { for (const KeyButtonPair& pair : list) {
if (pair.key_code == key_code) { if (pair.key_code == key_code)
pair.key_button->status.store(pressed); pair.key_button->status.store(pressed);
} }
} }
}
void ChangeAllKeyStatus(bool pressed) { void ChangeAllKeyStatus(bool pressed) {
std::lock_guard guard{mutex}; std::lock_guard guard{mutex};

2
src/input_common/main.cpp
View file

@ -45,6 +45,7 @@ void Init() {
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
sdl = SDL::Init(); sdl = SDL::Init();
#endif #endif
udp = CemuhookUDP::Init(); udp = CemuhookUDP::Init();
} }
@ -111,6 +112,7 @@ std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type) {
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
pollers = sdl->GetPollers(type); pollers = sdl->GetPollers(type);
#endif #endif
return pollers; return pollers;
} }

1
src/input_common/sdl/sdl_impl.cpp
View file

@ -444,7 +444,6 @@ private:
class SDLAnalogFactory final : public Input::Factory<Input::AnalogDevice> { class SDLAnalogFactory final : public Input::Factory<Input::AnalogDevice> {
public: public:
explicit SDLAnalogFactory(SDLState& state_) : state(state_) {} explicit SDLAnalogFactory(SDLState& state_) : state(state_) {}
/** /**
* Creates analog device from joystick axes * Creates analog device from joystick axes
* @param params contains parameters for creating the device: * @param params contains parameters for creating the device:

6
src/yuzu/configuration/configure_input_player.cpp
View file

@ -281,8 +281,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
button->setContextMenuPolicy(Qt::CustomContextMenu); button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(button, &QPushButton::clicked, [=] { connect(button, &QPushButton::clicked, [=] {
HandleClick( HandleClick(button_map[button_id],
button_map[button_id],
[=](Common::ParamPackage params) { [=](Common::ParamPackage params) {
// Workaround for ZL & ZR for analog triggers like on XBOX controllors. // Workaround for ZL & ZR for analog triggers like on XBOX controllors.
// Analog triggers (from controllers like the XBOX controller) would not // Analog triggers (from controllers like the XBOX controller) would not
@ -325,8 +324,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analog_button->setContextMenuPolicy(Qt::CustomContextMenu); analog_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(analog_button, &QPushButton::clicked, [=]() { connect(analog_button, &QPushButton::clicked, [=]() {
HandleClick( HandleClick(analog_map_buttons[analog_id][sub_button_id],
analog_map_buttons[analog_id][sub_button_id],
[=](const Common::ParamPackage& params) { [=](const Common::ParamPackage& params) {
SetAnalogButton(params, analogs_param[analog_id], SetAnalogButton(params, analogs_param[analog_id],
analog_sub_buttons[sub_button_id]); analog_sub_buttons[sub_button_id]);