Rename rmenu_iterate to menu_iterate

This commit is contained in:
twinaphex 2013-03-09 16:22:11 +01:00
parent f14f6453df
commit 5e53be4b25
8 changed files with 8 additions and 9 deletions

View File

@ -239,8 +239,7 @@ begin_loop:
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
while((input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ? while((input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ?
android_run_events(android_app) : android_run_events(android_app) : menu_iterate());
rmenu_iterate());
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
} }
else else

View File

@ -319,7 +319,7 @@ begin_loop:
else if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) else if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
while(rmenu_iterate()); while (menu_iterate());
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
} }
else else

View File

@ -1675,7 +1675,7 @@ int rmenu_input_process(void *data, void *state)
return 0; return 0;
} }
bool rmenu_iterate(void) bool menu_iterate(void)
{ {
static uint16_t old_input_state = 0; static uint16_t old_input_state = 0;
static bool initial_held = true; static bool initial_held = true;

View File

@ -2637,7 +2637,7 @@ void menu_free(void)
rmenu_state.free_resources(&rmenu_state); rmenu_state.free_resources(&rmenu_state);
} }
bool rmenu_iterate(void) bool menu_iterate(void)
{ {
const char *msg; const char *msg;

View File

@ -205,7 +205,7 @@ enum
#define MAX_NO_OF_CONTROLS_SETTINGS SETTING_CONTROLS_DEFAULT_ALL+1 #define MAX_NO_OF_CONTROLS_SETTINGS SETTING_CONTROLS_DEFAULT_ALL+1
void menu_init (void); void menu_init (void);
bool rmenu_iterate(void); bool menu_iterate(void);
void menu_free (void); void menu_free (void);
#endif /* MENU_H_ */ #endif /* MENU_H_ */

View File

@ -1291,7 +1291,7 @@ static void ingame_menu_resize (void)
input_loop = INPUT_LOOP_MENU; input_loop = INPUT_LOOP_MENU;
} }
bool rmenu_iterate(void) bool menu_iterate(void)
{ {
const char *msg; const char *msg;

View File

@ -194,7 +194,7 @@ void menu_init (void)
{ {
} }
bool rmenu_iterate(void) bool menu_iterate(void)
{ {
strlcpy(g_extern.fullpath, "/dev_hdd0/game/SSNE10000/USRDIR/mm3.nes", sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, "/dev_hdd0/game/SSNE10000/USRDIR/mm3.nes", sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);

View File

@ -94,7 +94,7 @@ static int setup_callback(void)
void menu_init (void) {} void menu_init (void) {}
bool rmenu_iterate(void) bool menu_iterate(void)
{ {
char path[256]; char path[256];
snprintf(path, sizeof(path), "%s%s", default_paths.port_dir, "dkc.sfc"); snprintf(path, sizeof(path), "%s%s", default_paths.port_dir, "dkc.sfc");