archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mmjoy: add member prefix to blacklist

Browse source
This commit is contained in:
Megamouse 2021-10-14 22:26:17 +02:00
parent 1584aba387
commit 90548468ee
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Input/mm_joystick_handler.cpp
View file

@ -179,7 +179,7 @@ std::array<u32, PadHandlerBase::button::button_count> 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<std::string>& buttons) 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<std::string>& buttons)
{ {
if (get_blacklist) if (get_blacklist)
blacklist.clear(); m_blacklist.clear();
if (!Init()) if (!Init())
{ {
@ -234,14 +234,14 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const
u64 keycode = button.first; u64 keycode = button.first;
u16 value = data[keycode]; 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; continue;
if (value > m_thumb_threshold) if (value > m_thumb_threshold)
{ {
if (get_blacklist) 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); input_log.error("MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) 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; u64 keycode = button.first;
u16 value = data[keycode]; 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; continue;
if (value > 0) if (value > 0)
{ {
if (get_blacklist) 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); input_log.error("MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) 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) if (keycode == NO_BUTTON)
continue; 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; continue;
const u16 value = data[keycode]; 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) 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); input_log.error("MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) 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 (get_blacklist)
{ {
if (blacklist.empty()) if (m_blacklist.empty())
input_log.success("MMJOY Calibration: Blacklist is clear. No input spam detected"); input_log.success("MMJOY Calibration: Blacklist is clear. No input spam detected");
return; return;
} }

2
rpcs3/Input/mm_joystick_handler.h
View file

@ -127,7 +127,7 @@ private:
bool is_init = false; bool is_init = false;
std::vector<u64> blacklist; std::vector<u64> m_blacklist;
std::shared_ptr<MMJOYDevice> m_dev; std::shared_ptr<MMJOYDevice> m_dev;
std::unordered_map<int, MMJOYDevice> m_devices; std::unordered_map<int, MMJOYDevice> m_devices;