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

Input: Use global variables for pad modifications

Browse source
This commit is contained in:
Megamouse 2020-06-24 17:01:48 +02:00
parent 9679ae68cb
commit 76faaf43f7
8 changed files with 51 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/Input/pad_thread.cpp
View file

@ -21,6 +21,9 @@ namespace pad
atomic_t<pad_thread*> g_current = nullptr;
std::recursive_mutex g_pad_mutex;
std::string g_title_id;
atomic_t<bool> g_reset{false};
atomic_t<bool> g_enabled{false};
atomic_t<bool> g_active;
}
struct pad_setting
@ -43,7 +46,7 @@ pad_thread::pad_thread(void *_curthread, void *_curwindow, std::string_view titl
pad_thread::~pad_thread()
{
pad::g_current = nullptr;
active = false;
pad::g_active = false;
thread->join();
handlers.clear();
@ -167,17 +170,6 @@ void pad_thread::SetRumble(const u32 pad, u8 largeMotor, bool smallMotor)
}
}
void pad_thread::Reset(std::string_view title_id)
{
pad::g_title_id = title_id;
reset = active.load();
}
void pad_thread::SetEnabled(bool enabled)
{
is_enabled = enabled;
}
void pad_thread::SetIntercepted(bool intercepted)
{
if (intercepted)
@ -193,16 +185,16 @@ void pad_thread::SetIntercepted(bool intercepted)
void pad_thread::ThreadFunc()
{
active = true;
while (active)
pad::g_active = true;
while (pad::g_active)
{
if (!is_enabled)
if (!pad::g_enabled)
{
std::this_thread::sleep_for(1ms);
continue;
}
if (reset && reset.exchange(false))
if (pad::g_reset && pad::g_reset.exchange(false))
{
Init();
}