Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added the device serial number to the es_log.txt entries when adding or removing controllers

Browse source
This commit is contained in:
Leon Styhre 2023-08-12 18:43:15 +02:00
parent c782fd9785
commit 28ca932b65
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
es-core/src/InputManager.cpp
View file

@ -151,7 +151,6 @@ void InputManager::writeDeviceConfig(InputConfig* config)
if (Utils::FileSystem::exists(path)) { if (Utils::FileSystem::exists(path)) {
// Merge files. // Merge files.
#if defined(_WIN64) #if defined(_WIN64)
pugi::xml_parse_result result { pugi::xml_parse_result result {
doc.load_file(Utils::String::stringToWideString(path).c_str())}; doc.load_file(Utils::String::stringToWideString(path).c_str())};
@ -317,9 +316,10 @@ std::string InputManager::getDeviceGUIDString(int deviceId)
return "Something went horribly wrong"; return "Something went horribly wrong";
} }
char guid[65]; std::string guid(65, '\0');
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(it->second), guid, 65); SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(it->second), &guid[0], 64);
return std::string(guid); guid.erase(guid.find('\0'));
return guid;
} }
InputConfig* InputManager::getInputConfigByDevice(int device) InputConfig* InputManager::getInputConfigByDevice(int device)
@ -536,14 +536,6 @@ bool InputManager::loadInputConfig(InputConfig* config)
pugi::xml_node configNode {root.find_child_by_attribute("inputConfig", "deviceGUID", pugi::xml_node configNode {root.find_child_by_attribute("inputConfig", "deviceGUID",
config->getDeviceGUIDString().c_str())}; config->getDeviceGUIDString().c_str())};
// Enabling this will match an entry in es_input.xml based on the device name if there
// was no GUID match. This is probably not a good idea as many controllers share the same
// name even though the GUID differ and potentially the button configuration could be
// different between them. Keeping the code for now though.
// if (!configNode)
// configNode = root.find_child_by_attribute("inputConfig",
// "deviceName", config->getDeviceName().c_str());
// With the move to the SDL GameController API the button layout changed quite a lot, so // With the move to the SDL GameController API the button layout changed quite a lot, so
// es_input.xml files generated using the old API will end up with a completely unusable // es_input.xml files generated using the old API will end up with a completely unusable
// controller configuration. These older files had the configuration entry type set to // controller configuration. These older files had the configuration entry type set to
@ -652,17 +644,22 @@ void InputManager::addControllerByDeviceIndex(Window* window, int deviceIndex)
mInputConfigs[joyID] = mInputConfigs[joyID] =
std::make_unique<InputConfig>(joyID, SDL_GameControllerName(mControllers[joyID]), guid); std::make_unique<InputConfig>(joyID, SDL_GameControllerName(mControllers[joyID]), guid);
bool customConfig = loadInputConfig(mInputConfigs[joyID].get()); bool customConfig {loadInputConfig(mInputConfigs[joyID].get())};
const std::string serialNumber {SDL_GameControllerGetSerial(controller) == nullptr ?
"" :
SDL_GameControllerGetSerial(controller)};
if (customConfig) { if (customConfig) {
LOG(LogInfo) << "Added controller with custom configuration: \"" LOG(LogInfo) << "Added controller with custom configuration: \""
<< SDL_GameControllerName(mControllers[joyID]) << "\" (GUID: " << guid << SDL_GameControllerName(mControllers[joyID]) << "\" (GUID: " << guid
<< ", serial number: " << (serialNumber == "" ? "n/a" : serialNumber)
<< ", instance ID: " << joyID << ", device index: " << deviceIndex << ")"; << ", instance ID: " << joyID << ", device index: " << deviceIndex << ")";
} }
else { else {
loadDefaultControllerConfig(joyID); loadDefaultControllerConfig(joyID);
LOG(LogInfo) << "Added controller with default configuration: \"" LOG(LogInfo) << "Added controller with default configuration: \""
<< SDL_GameControllerName(mControllers[joyID]) << "\" (GUID: " << guid << SDL_GameControllerName(mControllers[joyID]) << "\" (GUID: " << guid
<< ", serial number: " << (serialNumber == "" ? "n/a" : serialNumber)
<< ", instance ID: " << joyID << ", device index: " << deviceIndex << ")"; << ", instance ID: " << joyID << ", device index: " << deviceIndex << ")";
} }
@ -700,8 +697,14 @@ void InputManager::removeControllerByJoystickID(Window* window, SDL_JoystickID j
return; return;
} }
const std::string serialNumber {SDL_GameControllerGetSerial(mControllers[joyID]) == nullptr ?
"" :
SDL_GameControllerGetSerial(mControllers[joyID])};
LOG(LogInfo) << "Removed controller \"" << SDL_GameControllerName(mControllers[joyID]) LOG(LogInfo) << "Removed controller \"" << SDL_GameControllerName(mControllers[joyID])
<< "\" (GUID: " << guid << ", instance ID: " << joyID << ")"; << "\" (GUID: " << guid
<< ", serial number: " << (serialNumber == "" ? "n/a" : serialNumber)
<< ", instance ID: " << joyID << ")";
if (window != nullptr) { if (window != nullptr) {
window->queueInfoPopup( window->queueInfoPopup(