From 90548468ee1b5fc0866b03c7a80e4000e2cde37c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 14 Oct 2021 22:26:17 +0200 Subject: [PATCH] mmjoy: add member prefix to blacklist --- rpcs3/Input/mm_joystick_handler.cpp | 16 ++++++++-------- rpcs3/Input/mm_joystick_handler.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp index 8438aa9e4f..b421a3f07e 100644 --- a/rpcs3/Input/mm_joystick_handler.cpp +++ b/rpcs3/Input/mm_joystick_handler.cpp @@ -179,7 +179,7 @@ std::array mm_joystick_handler::get_m void mm_joystick_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist, const std::vector& buttons) { if (get_blacklist) - blacklist.clear(); + m_blacklist.clear(); if (!Init()) { @@ -234,14 +234,14 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const u64 keycode = button.first; u16 value = data[keycode]; - if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end()) + if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), keycode) != m_blacklist.end()) continue; if (value > m_thumb_threshold) { if (get_blacklist) { - blacklist.emplace_back(keycode); + m_blacklist.emplace_back(keycode); input_log.error("MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); } else if (value > pressed_button.first) @@ -254,14 +254,14 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const u64 keycode = button.first; u16 value = data[keycode]; - if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end()) + if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), keycode) != m_blacklist.end()) continue; if (value > 0) { if (get_blacklist) { - blacklist.emplace_back(keycode); + m_blacklist.emplace_back(keycode); input_log.error("MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); } else if (value > pressed_button.first) @@ -276,7 +276,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const if (keycode == NO_BUTTON) continue; - if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end()) + if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), keycode) != m_blacklist.end()) continue; const u16 value = data[keycode]; @@ -285,7 +285,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const { if (get_blacklist) { - blacklist.emplace_back(keycode); + m_blacklist.emplace_back(keycode); input_log.error("MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); } else if (value > pressed_button.first) @@ -295,7 +295,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const if (get_blacklist) { - if (blacklist.empty()) + if (m_blacklist.empty()) input_log.success("MMJOY Calibration: Blacklist is clear. No input spam detected"); return; } diff --git a/rpcs3/Input/mm_joystick_handler.h b/rpcs3/Input/mm_joystick_handler.h index ebd2bdc7ff..87a1dcb9d4 100644 --- a/rpcs3/Input/mm_joystick_handler.h +++ b/rpcs3/Input/mm_joystick_handler.h @@ -127,7 +127,7 @@ private: bool is_init = false; - std::vector blacklist; + std::vector m_blacklist; std::shared_ptr m_dev; std::unordered_map m_devices;