mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Circular header dependencies are the pits

Browse Source
This commit is contained in:
Twinaphex 2015-09-28 06:10:42 +02:00
parent e133df155d
commit bbc5bc9f6e
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu.h
View File

@ -60,24 +60,6 @@
extern "C" {
#endif
enum menu_action
{
MENU_ACTION_NOOP = 0,
MENU_ACTION_UP,
MENU_ACTION_DOWN,
MENU_ACTION_LEFT,
MENU_ACTION_RIGHT,
MENU_ACTION_OK,
MENU_ACTION_SEARCH,
MENU_ACTION_SCAN,
MENU_ACTION_CANCEL,
MENU_ACTION_INFO,
MENU_ACTION_SELECT,
MENU_ACTION_START,
MENU_ACTION_SCROLL_DOWN,
MENU_ACTION_SCROLL_UP,
MENU_ACTION_TOGGLE
};
typedef enum
{

4
menu/menu_input.c
View File

@ -1204,10 +1204,10 @@ void menu_input_post_iterate(int *ret, unsigned action)
*ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
}
enum menu_action menu_input_frame(retro_input_t input, retro_input_t trigger_input)
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
{
float delta_time;
enum menu_action ret = MENU_ACTION_NOOP;
unsigned ret = MENU_ACTION_NOOP;
static bool initial_held = true;
static bool first_held = false;
static const retro_input_t input_repeat =

21
menu/menu_input.h
View File

@ -25,6 +25,25 @@
extern "C" {
#endif
enum menu_action
{
MENU_ACTION_NOOP = 0,
MENU_ACTION_UP,
MENU_ACTION_DOWN,
MENU_ACTION_LEFT,
MENU_ACTION_RIGHT,
MENU_ACTION_OK,
MENU_ACTION_SEARCH,
MENU_ACTION_SCAN,
MENU_ACTION_CANCEL,
MENU_ACTION_INFO,
MENU_ACTION_SELECT,
MENU_ACTION_START,
MENU_ACTION_SCROLL_DOWN,
MENU_ACTION_SCROLL_UP,
MENU_ACTION_TOGGLE
};
enum menu_input_pointer_state
{
MENU_POINTER_X_AXIS = 0,
@ -88,7 +107,7 @@ void menu_input_st_cheat_callback(void *userdata, const char *str);
int menu_input_bind_iterate(char *s, size_t len);
enum menu_action menu_input_frame(retro_input_t input, retro_input_t trigger_state);
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_state);
void menu_input_post_iterate(int *ret, unsigned action);