(Menu) Cleanups

This commit is contained in:
twinaphex 2015-06-13 02:40:01 +02:00
parent 43c8f282db
commit 34a44983a0
3 changed files with 28 additions and 27 deletions

View File

@ -225,16 +225,16 @@ bool menu_display_init_main_font(menu_handle_t *menu,
void menu_display_set_viewport(void)
{
unsigned width, height;
video_driver_get_size(&width, &height);
video_driver_get_size(&width, &height);
video_driver_set_viewport(width, height, true, false);
}
void menu_display_unset_viewport(void)
{
unsigned width, height;
video_driver_get_size(&width, &height);
video_driver_get_size(&width, &height);
video_driver_set_viewport(width,
height, false, true);
}

View File

@ -54,12 +54,12 @@ int menu_entry_go_back(void)
static rarch_setting_t *menu_entry_get_setting(uint32_t i)
{
unsigned type = 0;
const char *path = NULL;
const char *entry_label = NULL;
const char *dir = NULL;
const char *label = NULL;
menu_list_t *menu_list = menu_list_get_ptr();
unsigned type = 0;
unsigned menu_type = 0;
menu_list_get_last_stack(menu_list, &dir,
@ -75,11 +75,12 @@ static rarch_setting_t *menu_entry_get_setting(uint32_t i)
enum menu_entry_type menu_entry_get_type(uint32_t i)
{
rarch_setting_t *setting = NULL;
const char *path = NULL, *entry_label = NULL;
unsigned type = 0;
const char *path = NULL;
const char *entry_label = NULL;
const char *dir = NULL;
const char *label = NULL;
menu_list_t *menu_list = menu_list_get_ptr();
unsigned type = 0;
unsigned menu_type = 0;
menu_list_get_last_stack(menu_list, &dir,

View File

@ -570,11 +570,11 @@ int menu_input_bind_iterate(void)
static int menu_input_mouse(unsigned *action)
{
video_viewport_t vp;
const struct retro_keybind *binds[MAX_USERS];
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
video_viewport_t vp;
if (!menu)
return -1;
@ -666,7 +666,7 @@ static int menu_input_mouse(unsigned *action)
static int menu_input_pointer(unsigned *action)
{
int pointer_device, pointer_x, pointer_y;
const struct retro_keybind *binds[MAX_USERS];
const struct retro_keybind *binds[MAX_USERS] = {NULL};
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
@ -934,7 +934,7 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
void menu_input_post_iterate(int *ret, unsigned action)
{
menu_entry_t entry;
menu_entry_t entry = {{0}};
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
settings_t *settings = config_get_ptr();