RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 15:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Qt/Input: use name_string instead of hard coded strings

Browse source 
hopefully prevents any more need for fixups like this lol
+ tend to some warnings for rebase
This commit is contained in:
Megamouse 2018-01-17 02:23:50 +01:00 • committed by Ani
parent d6c4d8eec0
commit 7aa1707c2c
8 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/ds4_pad_handler.cpp
View file

@ -96,6 +96,8 @@ ds4_pad_handler::ds4_pad_handler() : PadHandlerBase(pad_handler::ds4)
b_has_rumble = true;
b_has_deadzones = true;
m_name_string = "Ds4 Pad #";
m_trigger_threshold = trigger_max / 2;
m_thumb_threshold = thumb_max / 2;
}
@ -252,7 +254,7 @@ std::shared_ptr<ds4_pad_handler::DS4Device> ds4_pad_handler::GetDevice(const std
if (!Init())
return nullptr;
size_t pos = padId.find("Ds4 Pad #");
size_t pos = padId.find(m_name_string);
if (pos == std::string::npos)
return nullptr;
@ -768,7 +770,7 @@ std::vector<std::string> ds4_pad_handler::ListDevices()
for (auto& pad : controllers)
{
ds4_pads_list.emplace_back("Ds4 Pad #" + pad.first);
ds4_pads_list.emplace_back(m_name_string + pad.first);
}
return ds4_pads_list;