diff options
| author | Andrew Meadows <andrew.l.meadows@gmail.com> | 2024-10-03 12:08:26 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew.l.meadows@gmail.com> | 2024-10-03 12:08:26 -0700 |
| commit | ea650ac073aeb03ab99b88c41f51ce636ce37982 (patch) | |
| tree | ef00935573ba1cab6955b9d204e35209062f84e9 /indra/llwindow/llgamecontrol.cpp | |
| parent | 0617923ae7f450ece7288f8a73446c45a8ed32db (diff) | |
fix GameControl save settings, fix linux build
Diffstat (limited to 'indra/llwindow/llgamecontrol.cpp')
| -rw-r--r-- | indra/llwindow/llgamecontrol.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/indra/llwindow/llgamecontrol.cpp b/indra/llwindow/llgamecontrol.cpp index 01c6f91d25..9d3c854ca2 100644 --- a/indra/llwindow/llgamecontrol.cpp +++ b/indra/llwindow/llgamecontrol.cpp @@ -41,11 +41,6 @@ namespace std { - string to_string(const char* text) - { - return text ? string(text) : LLStringUtil::null; - } - string to_string(const SDL_JoystickGUID& guid) { char buffer[33] = { 0 }; @@ -149,7 +144,7 @@ namespace std SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick); ss << ",guid:'" << guid << "'"; ss << ",type:'" << SDL_JoystickGetType(joystick) << "'"; - ss << ",name:'" << std::to_string(SDL_JoystickName(joystick)) << "'"; + ss << ",name:'" << ll_safe_string(SDL_JoystickName(joystick)) << "'"; ss << ",vendor:" << SDL_JoystickGetVendor(joystick); ss << ",product:" << SDL_JoystickGetProduct(joystick); if (U16 version = SDL_JoystickGetProductVersion(joystick)) @@ -179,7 +174,7 @@ namespace std stringstream ss; ss << "{type:'" << SDL_GameControllerGetType(controller) << "'"; - ss << ",name:'" << std::to_string(SDL_GameControllerName(controller)) << "'"; + ss << ",name:'" << ll_safe_string(SDL_GameControllerName(controller)) << "'"; ss << ",vendor:" << SDL_GameControllerGetVendor(controller); ss << ",product:" << SDL_GameControllerGetProduct(controller); if (U16 version = SDL_GameControllerGetProductVersion(controller)) @@ -1411,7 +1406,7 @@ void onJoystickDeviceAdded(const SDL_Event& event) { SDL_JoystickGUID guid(SDL_JoystickGetDeviceGUID(event.cdevice.which)); SDL_JoystickType type(SDL_JoystickGetDeviceType(event.cdevice.which)); - std::string name(std::to_string(SDL_JoystickNameForIndex(event.cdevice.which))); + std::string name(ll_safe_string(SDL_JoystickNameForIndex(event.cdevice.which))); LL_INFOS("SDL2") << "joystick {id:" << event.cdevice.which << ",guid:'" << guid << "'" @@ -1438,7 +1433,7 @@ void onControllerDeviceAdded(const SDL_Event& event) { std::string guid(std::to_string(SDL_JoystickGetDeviceGUID(event.cdevice.which))); SDL_GameControllerType type(SDL_GameControllerTypeForIndex(event.cdevice.which)); - std::string name(std::to_string(SDL_GameControllerNameForIndex(event.cdevice.which))); + std::string name(ll_safe_string(SDL_GameControllerNameForIndex(event.cdevice.which))); LL_INFOS("SDL2") << "controller {id:" << event.cdevice.which << ",guid:'" << guid << "'" @@ -1514,6 +1509,7 @@ bool LLGameControl::isInitialized() } // static +// TODO: find a cleaner way to provide callbacks to LLGameControl void LLGameControl::init(const std::string& gamecontrollerdb_path, std::function<bool(const std::string&)> loadBoolean, std::function<void(const std::string&, bool)> saveBoolean, |