Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Partially fix SDL joysticks with same name

Browse Source 
Fixes #1334
This commit is contained in:
Brad Hughes 2016-08-29 22:16:32 -04:00
parent dcdd2cc5ba
commit 5281612e2a
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/osd/modules/input/input_sdl.cpp
View File

@ -24,6 +24,7 @@
#include <mutex> #include <mutex>
#include <memory> #include <memory>
#include <queue> #include <queue>
#include <iterator>
#include <algorithm> #include <algorithm>
// MAME headers // MAME headers
@ -687,29 +688,27 @@ public:
}; };
static void devmap_register(device_map_t *devmap, int physical_idx, const std::string &name) static void devmap_register(device_map_t &devmap, int physical_idx, const std::string &name)
{ {
int found = 0; // Attempt to find the entry by name
int stick, i; auto entry = std::find_if(std::begin(devmap.map), std::end(devmap.map), [&name](auto &item)
for (i = 0; i < MAX_DEVMAP_ENTRIES; i++)
{ {
if (strcmp(name.c_str(), devmap->map[i].name.c_str()) == 0 && devmap->map[i].physical < 0) return item.name == name && item.physical < 0;
{ });
devmap->map[i].physical = physical_idx;
found = 1; // If we didn't find it by name, find the first free slot
devmap->logical[physical_idx] = i; if (entry == std::end(devmap.map))
} {
entry = std::find_if(std::begin(devmap.map), std::end(devmap.map), [](auto &item) { return item.name.empty(); });
} }
if (found == 0) if (entry != std::end(devmap.map))
{ {
stick = devmap_leastfree(devmap); entry->physical = physical_idx;
devmap->map[stick].physical = physical_idx; entry->name = name;
devmap->map[stick].name = name; int logical_idx = std::distance(std::begin(devmap.map), entry);
devmap->logical[physical_idx] = stick; devmap.logical[physical_idx] = logical_idx;
} }
} }
//============================================================ //============================================================
@ -757,7 +756,7 @@ public:
for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++) for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
{ {
std::string joy_name = remove_spaces(SDL_JoystickNameForIndex(physical_stick)); std::string joy_name = remove_spaces(SDL_JoystickNameForIndex(physical_stick));
devmap_register(&m_joy_map, physical_stick, joy_name.c_str()); devmap_register(m_joy_map, physical_stick, joy_name);
} }
for (int stick = 0; stick < MAX_DEVMAP_ENTRIES; stick++) for (int stick = 0; stick < MAX_DEVMAP_ENTRIES; stick++)

12
src/osd/modules/input/input_sdlcommon.h
View File

@ -148,17 +148,6 @@ private:
// INLINE FUNCTIONS // INLINE FUNCTIONS
//============================================================ //============================================================
static inline int devmap_leastfree(device_map_t *devmap)
{
for (int i = 0; i < MAX_DEVMAP_ENTRIES; i++)
{
if (devmap->map[i].name.length() == 0)
return i;
}
return -1;
}
static inline std::string remove_spaces(const char *s) static inline std::string remove_spaces(const char *s)
{ {
// Remove the spaces // Remove the spaces
@ -184,6 +173,7 @@ static inline void devmap_init(running_machine &machine, device_map_t *devmap, c
// Initialize the map to default uninitialized values // Initialize the map to default uninitialized values
for (dev = 0; dev < MAX_DEVMAP_ENTRIES; dev++) for (dev = 0; dev < MAX_DEVMAP_ENTRIES; dev++)
{ {
devmap->map[dev].name.clear();
devmap->map[dev].physical = -1; devmap->map[dev].physical = -1;
devmap->logical[dev] = -1; devmap->logical[dev] = -1;
} }