Use a hint for gamecontrollerdb.txt, log controller GUID/Mapping strings

FNA-XNA · Jun 29, 2021 · 591b3a3 · 591b3a3
1 parent 02a048f
commit 591b3a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/SDL2-CS b/lib/SDL2-CS
diff --git a/src/FNAPlatform/SDL2_FNAPlatform.cs b/src/FNAPlatform/SDL2_FNAPlatform.cs
@@ -122,7 +122,8 @@ out prevUserData
 			);
 			if (File.Exists(mappingsDB))
 			{
-				SDL.SDL_GameControllerAddMappingsFromFile(
+				SDL.SDL_SetHint(
+					SDL.SDL_HINT_GAMECONTROLLERCONFIG_FILE,
 					mappingsDB
 				);
 			}
@@ -2105,9 +2106,21 @@ private static void INTERNAL_AddInstance(int dev)
 			}
 
 			// Print controller information to stdout.
+			string deviceInfo;
+			string mapping = SDL.SDL_GameControllerMapping(INTERNAL_devices[which]);
+			if (string.IsNullOrEmpty(mapping))
+			{
+				deviceInfo = "Mapping not found";
+			}
+			else
+			{
+				deviceInfo = "Mapping: " + mapping;
+			}
 			FNALoggerEXT.LogInfo(
 				"Controller " + which.ToString() + ": " +
-				SDL.SDL_GameControllerName(INTERNAL_devices[which])
+				SDL.SDL_GameControllerName(INTERNAL_devices[which]) + ", " +
+				"GUID: " + INTERNAL_guids[which] + ", " +
+				deviceInfo
 			);
 		}