DataHearth/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input_common: Replace usage of string guid to common uuid

Browse Source
This commit is contained in:
Narr the Reg 2022-06-06 19:39:22 -05:00
parent 45bdbf538c
commit 28877cea31
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/input_common/drivers/sdl_driver.cpp
View File

@ -13,11 +13,11 @@
namespace InputCommon { namespace InputCommon {
namespace { namespace {
std::string GetGUID(SDL_Joystick* joystick) { Common::UUID GetGUID(SDL_Joystick* joystick) {
const SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick); const SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick);
char guid_str[33]; std::array<u8, 16> data{};
SDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); std::memcpy(data.data(), guid.data, sizeof(data));
return guid_str; return Common::UUID{data};
} }
} // Anonymous namespace } // Anonymous namespace
@ -31,9 +31,9 @@ static int SDLEventWatcher(void* user_data, SDL_Event* event) {
class SDLJoystick { class SDLJoystick {
public: public:
SDLJoystick(std::string guid_, int port_, SDL_Joystick* joystick, SDLJoystick(Common::UUID guid_, int port_, SDL_Joystick* joystick,
SDL_GameController* game_controller) SDL_GameController* game_controller)
: guid{std::move(guid_)}, port{port_}, sdl_joystick{joystick, &SDL_JoystickClose}, : guid{guid_}, port{port_}, sdl_joystick{joystick, &SDL_JoystickClose},
sdl_controller{game_controller, &SDL_GameControllerClose} { sdl_controller{game_controller, &SDL_GameControllerClose} {
EnableMotion(); EnableMotion();
} }
@ -120,7 +120,7 @@ public:
*/ */
const PadIdentifier GetPadIdentifier() const { const PadIdentifier GetPadIdentifier() const {
return { return {
.guid = Common::UUID{guid}, .guid = guid,
.port = static_cast<std::size_t>(port), .port = static_cast<std::size_t>(port),
.pad = 0, .pad = 0,
}; };
@ -129,7 +129,7 @@ public:
/** /**
* The guid of the joystick * The guid of the joystick
*/ */
const std::string& GetGUID() const { const Common::UUID& GetGUID() const {
return guid; return guid;
} }
@ -228,7 +228,7 @@ public:
} }
private: private:
std::string guid; Common::UUID guid;
int port; int port;
std::unique_ptr<SDL_Joystick, decltype(&SDL_JoystickClose)> sdl_joystick; std::unique_ptr<SDL_Joystick, decltype(&SDL_JoystickClose)> sdl_joystick;
std::unique_ptr<SDL_GameController, decltype(&SDL_GameControllerClose)> sdl_controller; std::unique_ptr<SDL_GameController, decltype(&SDL_GameControllerClose)> sdl_controller;
@ -240,7 +240,7 @@ private:
BasicMotion motion; BasicMotion motion;
}; };
std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickByGUID(const std::string& guid, int port) { std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickByGUID(const Common::UUID& guid, int port) {
std::scoped_lock lock{joystick_map_mutex}; std::scoped_lock lock{joystick_map_mutex};
const auto it = joystick_map.find(guid); const auto it = joystick_map.find(guid);
@ -259,9 +259,13 @@ std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickByGUID(const std::string&
return joystick_map[guid].emplace_back(std::move(joystick)); return joystick_map[guid].emplace_back(std::move(joystick));
} }
std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickByGUID(const std::string& guid, int port) {
return GetSDLJoystickByGUID(Common::UUID{guid}, port);
}
std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickBySDLID(SDL_JoystickID sdl_id) { std::shared_ptr<SDLJoystick> SDLDriver::GetSDLJoystickBySDLID(SDL_JoystickID sdl_id) {
auto sdl_joystick = SDL_JoystickFromInstanceID(sdl_id); auto sdl_joystick = SDL_JoystickFromInstanceID(sdl_id);
const std::string guid = GetGUID(sdl_joystick); const auto guid = GetGUID(sdl_joystick);
std::scoped_lock lock{joystick_map_mutex}; std::scoped_lock lock{joystick_map_mutex};
const auto map_it = joystick_map.find(guid); const auto map_it = joystick_map.find(guid);
@ -295,7 +299,7 @@ void SDLDriver::InitJoystick(int joystick_index) {
return; return;
} }
const std::string guid = GetGUID(sdl_joystick); const auto guid = GetGUID(sdl_joystick);
std::scoped_lock lock{joystick_map_mutex}; std::scoped_lock lock{joystick_map_mutex};
if (joystick_map.find(guid) == joystick_map.end()) { if (joystick_map.find(guid) == joystick_map.end()) {
@ -324,7 +328,7 @@ void SDLDriver::InitJoystick(int joystick_index) {
} }
void SDLDriver::CloseJoystick(SDL_Joystick* sdl_joystick) { void SDLDriver::CloseJoystick(SDL_Joystick* sdl_joystick) {
const std::string guid = GetGUID(sdl_joystick); const auto guid = GetGUID(sdl_joystick);
std::scoped_lock lock{joystick_map_mutex}; std::scoped_lock lock{joystick_map_mutex};
// This call to guid is safe since the joystick is guaranteed to be in the map // This call to guid is safe since the joystick is guaranteed to be in the map
@ -470,7 +474,7 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
devices.emplace_back(Common::ParamPackage{ devices.emplace_back(Common::ParamPackage{
{"engine", GetEngineName()}, {"engine", GetEngineName()},
{"display", std::move(name)}, {"display", std::move(name)},
{"guid", joystick->GetGUID()}, {"guid", joystick->GetGUID().RawString()},
{"port", std::to_string(joystick->GetPort())}, {"port", std::to_string(joystick->GetPort())},
}); });
if (joystick->IsJoyconLeft()) { if (joystick->IsJoyconLeft()) {
@ -493,8 +497,8 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
devices.emplace_back(Common::ParamPackage{ devices.emplace_back(Common::ParamPackage{
{"engine", GetEngineName()}, {"engine", GetEngineName()},
{"display", std::move(name)}, {"display", std::move(name)},
{"guid", joystick->GetGUID()}, {"guid", joystick->GetGUID().RawString()},
{"guid2", joystick2->GetGUID()}, {"guid2", joystick2->GetGUID().RawString()},
{"port", std::to_string(joystick->GetPort())}, {"port", std::to_string(joystick->GetPort())},
}); });
} }
@ -557,50 +561,50 @@ void SDLDriver::SendVibrations() {
} }
} }
Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, std::string guid, Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
s32 axis, float value) const { s32 axis, float value) const {
Common::ParamPackage params{}; Common::ParamPackage params{};
params.Set("engine", GetEngineName()); params.Set("engine", GetEngineName());
params.Set("port", port); params.Set("port", port);
params.Set("guid", std::move(guid)); params.Set("guid", guid.RawString());
params.Set("axis", axis); params.Set("axis", axis);
params.Set("threshold", "0.5"); params.Set("threshold", "0.5");
params.Set("invert", value < 0 ? "-" : "+"); params.Set("invert", value < 0 ? "-" : "+");
return params; return params;
} }
Common::ParamPackage SDLDriver::BuildButtonParamPackageForButton(int port, std::string guid, Common::ParamPackage SDLDriver::BuildButtonParamPackageForButton(int port, const Common::UUID& guid,
s32 button) const { s32 button) const {
Common::ParamPackage params{}; Common::ParamPackage params{};
params.Set("engine", GetEngineName()); params.Set("engine", GetEngineName());
params.Set("port", port); params.Set("port", port);
params.Set("guid", std::move(guid)); params.Set("guid", guid.RawString());
params.Set("button", button); params.Set("button", button);
return params; return params;
} }
Common::ParamPackage SDLDriver::BuildHatParamPackageForButton(int port, std::string guid, s32 hat, Common::ParamPackage SDLDriver::BuildHatParamPackageForButton(int port, const Common::UUID& guid,
u8 value) const { s32 hat, u8 value) const {
Common::ParamPackage params{}; Common::ParamPackage params{};
params.Set("engine", GetEngineName()); params.Set("engine", GetEngineName());
params.Set("port", port); params.Set("port", port);
params.Set("guid", std::move(guid)); params.Set("guid", guid.RawString());
params.Set("hat", hat); params.Set("hat", hat);
params.Set("direction", GetHatButtonName(value)); params.Set("direction", GetHatButtonName(value));
return params; return params;
} }
Common::ParamPackage SDLDriver::BuildMotionParam(int port, std::string guid) const { Common::ParamPackage SDLDriver::BuildMotionParam(int port, const Common::UUID& guid) const {
Common::ParamPackage params{}; Common::ParamPackage params{};
params.Set("engine", GetEngineName()); params.Set("engine", GetEngineName());
params.Set("motion", 0); params.Set("motion", 0);
params.Set("port", port); params.Set("port", port);
params.Set("guid", std::move(guid)); params.Set("guid", guid.RawString());
return params; return params;
} }
Common::ParamPackage SDLDriver::BuildParamPackageForBinding( Common::ParamPackage SDLDriver::BuildParamPackageForBinding(
int port, const std::string& guid, const SDL_GameControllerButtonBind& binding) const { int port, const Common::UUID& guid, const SDL_GameControllerButtonBind& binding) const {
switch (binding.bindType) { switch (binding.bindType) {
case SDL_CONTROLLER_BINDTYPE_NONE: case SDL_CONTROLLER_BINDTYPE_NONE:
break; break;

15
src/input_common/drivers/sdl_driver.h
View File

@ -47,6 +47,7 @@ public:
* Check how many identical joysticks (by guid) were connected before the one with sdl_id and so * Check how many identical joysticks (by guid) were connected before the one with sdl_id and so
* tie it to a SDLJoystick with the same guid and that port * tie it to a SDLJoystick with the same guid and that port
*/ */
std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const Common::UUID& guid, int port);
std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port); std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port);
std::vector<Common::ParamPackage> GetInputDevices() const override; std::vector<Common::ParamPackage> GetInputDevices() const override;
@ -79,18 +80,18 @@ private:
/// Takes all vibrations from the queue and sends the command to the controller /// Takes all vibrations from the queue and sends the command to the controller
void SendVibrations(); void SendVibrations();
Common::ParamPackage BuildAnalogParamPackageForButton(int port, std::string guid, s32 axis, Common::ParamPackage BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
float value = 0.1f) const; s32 axis, float value = 0.1f) const;
Common::ParamPackage BuildButtonParamPackageForButton(int port, std::string guid, Common::ParamPackage BuildButtonParamPackageForButton(int port, const Common::UUID& guid,
s32 button) const; s32 button) const;
Common::ParamPackage BuildHatParamPackageForButton(int port, std::string guid, s32 hat, Common::ParamPackage BuildHatParamPackageForButton(int port, const Common::UUID& guid, s32 hat,
u8 value) const; u8 value) const;
Common::ParamPackage BuildMotionParam(int port, std::string guid) const; Common::ParamPackage BuildMotionParam(int port, const Common::UUID& guid) const;
Common::ParamPackage BuildParamPackageForBinding( Common::ParamPackage BuildParamPackageForBinding(
int port, const std::string& guid, const SDL_GameControllerButtonBind& binding) const; int port, const Common::UUID& guid, const SDL_GameControllerButtonBind& binding) const;
Common::ParamPackage BuildParamPackageForAnalog(PadIdentifier identifier, int axis_x, Common::ParamPackage BuildParamPackageForAnalog(PadIdentifier identifier, int axis_x,
int axis_y, float offset_x, int axis_y, float offset_x,
@ -120,7 +121,7 @@ private:
Common::SPSCQueue<VibrationRequest> vibration_queue; Common::SPSCQueue<VibrationRequest> vibration_queue;
/// Map of GUID of a list of corresponding virtual Joysticks /// Map of GUID of a list of corresponding virtual Joysticks
std::unordered_map<std::string, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map; std::unordered_map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
std::mutex joystick_map_mutex; std::mutex joystick_map_mutex;
bool start_thread = false; bool start_thread = false;