Move menu_driver_render and menu_driver_render_messagebox to

menu_iterate.c and make them static
This commit is contained in:
twinaphex 2015-08-18 01:48:04 +02:00
parent 86894134cb
commit 443fd6b4f2
3 changed files with 21 additions and 25 deletions

View File

@ -360,27 +360,6 @@ void menu_driver_free(menu_handle_t *menu)
driver->free(menu);
}
void menu_driver_render_messagebox(const char *msg)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
const ui_companion_driver_t *ui = ui_companion_get_ptr();
if (!msg)
return;
if (driver->render_messagebox && msg[0] != '\0')
driver->render_messagebox(msg);
if (ui->render_messagebox && msg[0] != '\0')
ui->render_messagebox(msg);
}
void menu_driver_render(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->render)
driver->render();
}
void menu_driver_toggle(bool latch)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();

View File

@ -193,12 +193,8 @@ void menu_driver_context_reset(void);
void menu_driver_free(menu_handle_t *menu);
void menu_driver_render(void);
void menu_driver_toggle(bool latch);
void menu_driver_render_messagebox(const char *msg);
void menu_driver_populate_entries(const char *path, const char *label,
unsigned k);

View File

@ -33,6 +33,27 @@
#include "../input/input_common.h"
#include "../input/input_autodetect.h"
static void menu_driver_render_messagebox(const char *msg)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
const ui_companion_driver_t *ui = ui_companion_get_ptr();
if (!msg)
return;
if (driver->render_messagebox && msg[0] != '\0')
driver->render_messagebox(msg);
if (ui->render_messagebox && msg[0] != '\0')
ui->render_messagebox(msg);
}
static void menu_driver_render(void)
{
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->render)
driver->render();
}
static int action_iterate_help(char *s, size_t len, const char *label)
{
unsigned i;