mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move menu_driver_navigation_* functions to menu_navigation.c and

Browse Source 
make them static
This commit is contained in:
twinaphex 2015-08-18 01:45:10 +02:00
parent 8c5128b189
commit 86894134cb
3 changed files with 56 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
menu/menu_driver.c
View File

@ -313,46 +313,6 @@ void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
return NULL;
}
void menu_driver_navigation_increment(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_increment)
driver->navigation_increment();
}
void menu_driver_navigation_decrement(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_decrement)
driver->navigation_decrement();
}
void menu_driver_navigation_clear(bool pending_push)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_clear)
driver->navigation_clear(pending_push);
}
void menu_driver_navigation_set(bool scroll)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_set)
driver->navigation_set(scroll);
}
void menu_driver_navigation_set_last(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_set_last)
driver->navigation_set_last();
}
void menu_driver_set_texture(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
@ -448,22 +408,6 @@ bool menu_driver_load_image(void *data, menu_image_type_t type)
return false;
}
void menu_driver_navigation_descend_alphabet(size_t *ptr_out)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_descend_alphabet)
driver->navigation_descend_alphabet(ptr_out);
}
void menu_driver_navigation_ascend_alphabet(size_t *ptr_out)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_ascend_alphabet)
driver->navigation_ascend_alphabet(ptr_out);
}
bool menu_driver_alive(void)
{
return menu_alive;

14
menu/menu_driver.h
View File

@ -185,16 +185,6 @@ void init_menu(void);
menu_handle_t *menu_driver_get_ptr(void);
void menu_driver_navigation_increment(void);
void menu_driver_navigation_decrement(void);
void menu_driver_navigation_clear(bool pending_push);
void menu_driver_navigation_set(bool scroll);
void menu_driver_navigation_set_last(void);
void menu_driver_set_texture(void);
void menu_driver_frame(void);
@ -214,10 +204,6 @@ void menu_driver_populate_entries(const char *path, const char *label,
bool menu_driver_load_image(void *data, menu_image_type_t type);
void menu_driver_navigation_descend_alphabet(size_t *);
void menu_driver_navigation_ascend_alphabet(size_t *);
void menu_driver_list_cache(menu_list_type_t type, unsigned action);
void menu_driver_list_free(file_list_t *list, size_t i, size_t list_size);

56
menu/menu_navigation.c
View File

@ -29,6 +29,62 @@
#include "../configuration.h"
static void menu_driver_navigation_increment(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_increment)
driver->navigation_increment();
}
static void menu_driver_navigation_decrement(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_decrement)
driver->navigation_decrement();
}
static void menu_driver_navigation_clear(bool pending_push)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_clear)
driver->navigation_clear(pending_push);
}
static void menu_driver_navigation_set(bool scroll)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_set)
driver->navigation_set(scroll);
}
static void menu_driver_navigation_set_last(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_set_last)
driver->navigation_set_last();
}
static void menu_driver_navigation_descend_alphabet(size_t *ptr_out)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_descend_alphabet)
driver->navigation_descend_alphabet(ptr_out);
}
static void menu_driver_navigation_ascend_alphabet(size_t *ptr_out)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->navigation_ascend_alphabet)
driver->navigation_ascend_alphabet(ptr_out);
}
menu_navigation_t *menu_navigation_get_ptr(void)
{
menu_entries_t *entries = menu_entries_get_ptr();