libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 10:40:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Android/RARCH_CONSOLE) Move DPAD_EMULATION enums to general.h -

Browse Source 
makes it easier from maintenance perspective
This commit is contained in:
twinaphex 2012-12-31 17:50:47 +01:00
parent 9f361de651
commit e2163317d7
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/native/jni/input_android.c
View File

@ -26,14 +26,6 @@
#define MAX_PADS 8
#define MAX_TOUCH 8
enum
{
DPAD_EMULATION_NONE = 0,
DPAD_EMULATION_LSTICK,
DPAD_EMULATION_RSTICK,
DPAD_EMULATION_LAST
};
enum {
AKEYCODE_ESCAPE = 111,
AKEYCODE_BREAK = 121,

8
console/rarch_console_input.h
View File

@ -27,14 +27,6 @@ enum keybind_set_id
KEYBIND_DEFAULT
};
enum
{
DPAD_EMULATION_NONE = 0,
DPAD_EMULATION_LSTICK,
DPAD_EMULATION_RSTICK,
DPAD_EMULATION_LAST
};
extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY];
extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32];
extern char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32];

10
general.h
View File

@ -92,6 +92,14 @@
#define MAX_PLAYERS 8
enum dpad_emu_enums
{
DPAD_EMULATION_NONE = 0,
DPAD_EMULATION_LSTICK,
DPAD_EMULATION_RSTICK,
DPAD_EMULATION_LAST
};
// All config related settings go here.
struct settings
{
@ -173,7 +181,7 @@ struct settings
struct retro_keybind binds[MAX_PLAYERS][RARCH_BIND_LIST_END];
float axis_threshold;
int joypad_map[MAX_PLAYERS];
unsigned dpad_emulation[MAX_PLAYERS];
enum dpad_emu_enums dpad_emulation[MAX_PLAYERS];
#ifdef RARCH_CONSOLE
unsigned currently_selected_controller_no;
unsigned map_dpad_to_stick;