ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1326 from reicast/EvdevControllerMapping_string2 

evdev: Mapping name as string
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2018-08-25 21:25:32 +03:00 committed by GitHub
parent d4f12fae64 8593c209d9
commit ba8b9014a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/linux-dist/evdev.cpp
View File

@ -123,7 +123,7 @@
int type = ((strstr(keycode.c_str(), "ABS_") != NULL) ? EV_ABS : EV_KEY);
code = libevdev_event_code_from_name(type, keycode.c_str());
}
if (code < 0)
{
printf("evdev: failed to find keycode for '%s'\n", keycode.c_str());
@ -139,13 +139,13 @@
if(code >= 0)
{
char* name = NULL;
if (libevdev_available)
{
int type = ((strstr(dc_key.c_str(), "axis_") != NULL) ? EV_ABS : EV_KEY);
name = (char*)libevdev_event_code_get_name(type, code);
}
if (name != NULL)
{
printf("%s = %s (%d)\n", dc_key.c_str(), name, code);
@ -156,10 +156,10 @@
}
}
}
if (code < 0)
printf("WARNING: %s/%s not configured!\n", section.c_str(), dc_key.c_str());
return code;
}
@ -169,7 +169,7 @@
mf.parse(fd);
EvdevControllerMapping mapping = {
mf.get("emulator", "mapping_name", "<Unknown>").c_str(),
mf.get("emulator", "mapping_name", "<Unknown>"),
load_keycode(&mf, "dreamcast", "btn_a"),
load_keycode(&mf, "dreamcast", "btn_b"),
load_keycode(&mf, "dreamcast", "btn_c"),
@ -370,7 +370,7 @@
}
}
controller->mapping = &loaded_mappings.find(string(mapping_fname))->second;
printf("evdev: Using '%s' mapping\n", controller->mapping->name);
printf("evdev: Using '%s' mapping\n", controller->mapping->name.c_str());
controller->init();
return 0;

2
core/linux-dist/evdev.h
View File

@ -4,7 +4,7 @@
struct EvdevControllerMapping
{
const char* name;
const string name;
const int Btn_A;
const int Btn_B;
const int Btn_C;

2
core/linux-dist/main.cpp
View File

@ -193,7 +193,7 @@ void os_SetupInput()
// Multiple controllers with the same device, check for multiple button assignments
if (input_evdev_button_duplicate_button(evdev_controllers[i].mapping, evdev_controllers[port].mapping))
{
printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i, evdev_controllers[i].mapping->name);
printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i, evdev_controllers[i].mapping->name.c_str());
}
}
}