From 4b24cfa5ea10ab73fa4ec841ffb2cdd54488d24e Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Wed, 12 Apr 2017 17:17:39 +0200 Subject: [PATCH] onepad: use external resource to support more joysticks --- plugins/onepad/SDL/joystick.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugins/onepad/SDL/joystick.cpp b/plugins/onepad/SDL/joystick.cpp index f5a2cd90cc..3d3bd52ab4 100644 --- a/plugins/onepad/SDL/joystick.cpp +++ b/plugins/onepad/SDL/joystick.cpp @@ -20,6 +20,7 @@ */ #include "joystick.h" +#include "resources.h" #include // sigaction ////////////////////////// @@ -46,6 +47,20 @@ void JoystickInfo::EnumerateJoysticks(std::vector> &vjo SDL_JoystickEventState(SDL_QUERY); SDL_GameControllerEventState(SDL_QUERY); + + { // Support as much Joystick as possible + GBytes *bytes = g_resource_lookup_data(onepad_res_get_resource(), "/onepad/res/game_controller_db.txt", G_RESOURCE_LOOKUP_FLAGS_NONE, nullptr); + + size_t size = 0; + // SDL forget to add const for SDL_RWFromMem API... + void *data = const_cast(g_bytes_get_data(bytes, &size)); + + int map = SDL_GameControllerAddMappingsFromRW(SDL_RWFromMem(data, size), 1); + + fprintf(stdout, "onepad: load %d extra joystick map\n", map); + + g_bytes_unref(bytes); + } } vjoysticks.clear();