From e5169eee714e7cbf4323affbca06792434893b56 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Jan 2020 20:23:58 +0100 Subject: [PATCH] Remove menu/drivers/null.c - move it into menu/menu_driver.c --- Makefile.common | 1 - griffin/griffin.c | 1 - menu/drivers/null.c | 104 -------------------------------------------- menu/menu_driver.c | 62 ++++++++++++++++++++++++++ menu/menu_driver.h | 1 - 5 files changed, 62 insertions(+), 107 deletions(-) delete mode 100644 menu/drivers/null.c diff --git a/Makefile.common b/Makefile.common index 3ab92c80b3..7aad6a8efd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -814,7 +814,6 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/menu_displaylist.o \ menu/menu_animation.o \ menu/drivers/menu_generic.o \ - menu/drivers/null.o \ menu/menu_thumbnail_path.o \ menu/menu_thumbnail.o diff --git a/griffin/griffin.c b/griffin/griffin.c index cf8829eb95..8a97a947e4 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1277,7 +1277,6 @@ MENU #include "../menu/menu_thumbnail_path.c" #include "../menu/menu_thumbnail.c" -#include "../menu/drivers/null.c" #include "../menu/drivers/menu_generic.c" #if defined(HAVE_D3D8) diff --git a/menu/drivers/null.c b/menu/drivers/null.c deleted file mode 100644 index 454721d975..0000000000 --- a/menu/drivers/null.c +++ /dev/null @@ -1,104 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include "../menu_driver.h" - -static bool g_menu_on = false; - -static void* null_init(void **userdata, bool video_is_threaded) -{ - menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); - - if (!menu) - return NULL; - - return menu; -} - -static void null_free(void *data) -{ -} - -static void null_toggle(void *userdata, bool menu_on) -{ - (void)userdata; - - g_menu_on = menu_on; -} - -static int null_menu_iterate(void *data, void *userdata, enum menu_action action) -{ - (void)data; - (void)userdata; - (void)action; - - return 1; -} - -menu_ctx_driver_t menu_ctx_null = { - NULL, /* set_texture */ - NULL, /* render_messagebox */ - null_menu_iterate, - NULL, /* render */ - NULL, /* frame */ - null_init, - null_free, - NULL, /* context_reset */ - NULL, /* context_destroy */ - NULL, /* populate_entries */ - null_toggle, - NULL, /* navigation_clear */ - NULL, /* navigation_decrement */ - NULL, /* navigation_increment */ - NULL, /* navigation_set */ - NULL, /* navigation_set_last */ - NULL, /* navigation_descend_alphabet */ - NULL, /* navigation_ascend_alphabet */ - NULL, /* lists_init */ - NULL, /* list_insert */ - NULL, /* list_prepend */ - NULL, /* list_delete */ - NULL, /* list_clear */ - NULL, /* list_cache */ - NULL, /* list_push */ - NULL, /* list_get_selection */ - NULL, /* list_get_size */ - NULL, /* list_get_entry */ - NULL, /* list_set_selection */ - NULL, /* bind_init */ - NULL, /* load_image */ - "null", - NULL, /* environ */ - NULL, /* update_thumbnail_path */ - NULL, /* update_thumbnail_image */ - NULL, /* refresh_thumbnail_image */ - NULL, /* set_thumbnail_system */ - NULL, /* get_thumbnail_system */ - NULL, /* set_thumbnail_content */ - NULL, /* osk_ptr_at_pos */ - NULL, /* update_savestate_thumbnail_path */ - NULL, /* update_savestate_thumbnail_image */ - NULL, /* pointer_down */ - NULL, /* pointer_up */ - NULL, /* get_load_content_animation_data */ - NULL /* entry_action */ -}; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 27ad18f2f8..138e8ab94b 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -101,6 +101,68 @@ float osk_dark[16] = { 0.00, 0.00, 0.00, 0.85, }; +static void *null_menu_init(void **userdata, bool video_is_threaded) +{ + menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); + + if (!menu) + return NULL; + + return menu; +} + +static int null_menu_iterate(void *data, void *userdata, + enum menu_action action) { return 1; } + +static menu_ctx_driver_t menu_ctx_null = { + NULL, /* set_texture */ + NULL, /* render_messagebox */ + null_menu_iterate, + NULL, /* render */ + NULL, /* frame */ + null_menu_init, + NULL, /* free */ + NULL, /* context_reset */ + NULL, /* context_destroy */ + NULL, /* populate_entries */ + NULL, /* toggle */ + NULL, /* navigation_clear */ + NULL, /* navigation_decrement */ + NULL, /* navigation_increment */ + NULL, /* navigation_set */ + NULL, /* navigation_set_last */ + NULL, /* navigation_descend_alphabet */ + NULL, /* navigation_ascend_alphabet */ + NULL, /* lists_init */ + NULL, /* list_insert */ + NULL, /* list_prepend */ + NULL, /* list_delete */ + NULL, /* list_clear */ + NULL, /* list_cache */ + NULL, /* list_push */ + NULL, /* list_get_selection */ + NULL, /* list_get_size */ + NULL, /* list_get_entry */ + NULL, /* list_set_selection */ + NULL, /* bind_init */ + NULL, /* load_image */ + "null", + NULL, /* environ */ + NULL, /* update_thumbnail_path */ + NULL, /* update_thumbnail_image */ + NULL, /* refresh_thumbnail_image */ + NULL, /* set_thumbnail_system */ + NULL, /* get_thumbnail_system */ + NULL, /* set_thumbnail_content */ + NULL, /* osk_ptr_at_pos */ + NULL, /* update_savestate_thumbnail_path */ + NULL, /* update_savestate_thumbnail_image */ + NULL, /* pointer_down */ + NULL, /* pointer_up */ + NULL, /* get_load_content_animation_data */ + NULL /* entry_action */ +}; + /* Menu drivers */ static const menu_ctx_driver_t *menu_ctx_drivers[] = { #if defined(HAVE_MATERIALUI) diff --git a/menu/menu_driver.h b/menu/menu_driver.h index e02183f403..dc14ff43ac 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -743,7 +743,6 @@ extern menu_ctx_driver_t menu_ctx_rgui; extern menu_ctx_driver_t menu_ctx_mui; extern menu_ctx_driver_t menu_ctx_xmb; extern menu_ctx_driver_t menu_ctx_stripes; -extern menu_ctx_driver_t menu_ctx_null; RETRO_END_DECLS