From 0d9ba863dc5dccf65bf83d5be424c83e3cf1d84a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 19:11:51 +0100 Subject: [PATCH] Remove menu/disp/menu_display.h and menu/backend/menu_backend.h and merge into menu/menu_driver.h --- driver.h | 2 - menu/backend/menu_backend.h | 48 ----------------------- menu/backend/menu_common_backend.c | 1 - menu/backend/menu_lakka_backend.c | 1 - menu/disp/ios.c | 2 +- menu/disp/menu_display.h | 61 ------------------------------ menu/disp/rmenu.c | 2 +- menu/disp/rmenu_xui.cpp | 2 +- menu/menu_driver.h | 54 ++++++++++++++++++++++++++ 9 files changed, 57 insertions(+), 116 deletions(-) delete mode 100644 menu/backend/menu_backend.h delete mode 100644 menu/disp/menu_display.h diff --git a/driver.h b/driver.h index 30b1b353c0..ae7f4924ec 100644 --- a/driver.h +++ b/driver.h @@ -31,8 +31,6 @@ #include "audio/audio_driver.h" #include "menu/menu_driver.h" -#include "menu/backend/menu_backend.h" -#include "menu/disp/menu_display.h" #include "audio/resamplers/resampler.h" #include "record/ffemu.h" diff --git a/menu/backend/menu_backend.h b/menu/backend/menu_backend.h deleted file mode 100644 index 27f4f58a60..0000000000 --- a/menu/backend/menu_backend.h +++ /dev/null @@ -1,48 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - 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 . - */ - -#ifndef DRIVER_MENU_BACKEND_H__ -#define DRIVER_MENU_BACKEND_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct menu_file_list_cbs -{ - int (*action_deferred_push)(void *data, void *userdata, const char - *path, const char *label, unsigned type); - int (*action_ok)(const char *path, const char *label, unsigned type, - size_t idx); - int (*action_cancel)(const char *path, const char *label, unsigned type, - size_t idx); - int (*action_start)(unsigned type, const char *label, unsigned action); - int (*action_content_list_switch)(void *data, void *userdata, const char - *path, const char *label, unsigned type); - int (*action_toggle)(unsigned type, const char *label, unsigned action); -} menu_file_list_cbs_t; - -typedef struct menu_ctx_driver_backend -{ - int (*iterate)(unsigned); - const char *ident; -} menu_ctx_driver_backend_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/menu/backend/menu_common_backend.c b/menu/backend/menu_common_backend.c index dd827aa7a7..184ad2e6dd 100644 --- a/menu/backend/menu_common_backend.c +++ b/menu/backend/menu_common_backend.c @@ -20,7 +20,6 @@ #include #include #include -#include "menu_backend.h" #include "../menu_entries.h" #include "../menu_input.h" diff --git a/menu/backend/menu_lakka_backend.c b/menu/backend/menu_lakka_backend.c index 18011267c5..843efa45e2 100644 --- a/menu/backend/menu_lakka_backend.c +++ b/menu/backend/menu_lakka_backend.c @@ -23,7 +23,6 @@ #include #include "../menu_action.h" #include "../menu_navigation.h" -#include "menu_backend.h" #include "../../gfx/gfx_common.h" #include "../../driver.h" diff --git a/menu/disp/ios.c b/menu/disp/ios.c index 2a66ee113c..e7b8ccd07c 100644 --- a/menu/disp/ios.c +++ b/menu/disp/ios.c @@ -15,7 +15,7 @@ #include #include -#include "menu_display.h" +#include "../menu_driver.h" #include "../menu.h" #include "../../general.h" #include "ios.h" diff --git a/menu/disp/menu_display.h b/menu/disp/menu_display.h deleted file mode 100644 index bd9bd4ab3d..0000000000 --- a/menu/disp/menu_display.h +++ /dev/null @@ -1,61 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2015 - 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 . - */ - -#ifndef DRIVER_MENU_DISPLAY_H__ -#define DRIVER_MENU_DISPLAY_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct menu_ctx_driver -{ - void (*set_texture)(void*); - void (*render_messagebox)(const char*); - void (*render)(void); - void (*frame)(void); - void* (*init)(void); - bool (*init_lists)(void*); - void (*free)(void*); - void (*context_reset)(void*); - void (*context_destroy)(void*); - void (*populate_entries)(void*, const char *, const char *, - unsigned); - void (*iterate)(void*, unsigned); - int (*input_postprocess)(uint64_t, uint64_t); - void (*navigation_clear)(void *, bool); - void (*navigation_decrement)(void *); - void (*navigation_increment)(void *); - void (*navigation_set)(void *, bool); - void (*navigation_set_last)(void *); - void (*navigation_descend_alphabet)(void *, size_t *); - void (*navigation_ascend_alphabet)(void *, size_t *); - void (*list_insert)(void *, const char *, const char *, size_t); - void (*list_delete)(void *, size_t, size_t); - void (*list_clear)(void *); - void (*list_cache)(bool, unsigned); - void (*list_set_selection)(void *); - void (*init_core_info)(void *); - void (*update_core_info)(void *); - - const menu_ctx_driver_backend_t *backend; - const char *ident; -} menu_ctx_driver_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/menu/disp/rmenu.c b/menu/disp/rmenu.c index 44811d33a2..8a863ba8d6 100644 --- a/menu/disp/rmenu.c +++ b/menu/disp/rmenu.c @@ -21,7 +21,7 @@ #include #include -#include "menu_display.h" +#include "../menu_driver.h" #include "../menu.h" #include "../../general.h" #include "../../gfx/gfx_common.h" diff --git a/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp index 7fc6033592..f464792e11 100644 --- a/menu/disp/rmenu_xui.cpp +++ b/menu/disp/rmenu_xui.cpp @@ -20,7 +20,7 @@ #include #include -#include "menu_display.h" +#include "../menu_driver.h" #include "../menu.h" #include "../menu_list.h" diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 880deb1593..1dadf40956 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -141,6 +141,60 @@ typedef struct rarch_setting_t *list_settings; } menu_handle_t; +typedef struct menu_file_list_cbs +{ + int (*action_deferred_push)(void *data, void *userdata, const char + *path, const char *label, unsigned type); + int (*action_ok)(const char *path, const char *label, unsigned type, + size_t idx); + int (*action_cancel)(const char *path, const char *label, unsigned type, + size_t idx); + int (*action_start)(unsigned type, const char *label, unsigned action); + int (*action_content_list_switch)(void *data, void *userdata, const char + *path, const char *label, unsigned type); + int (*action_toggle)(unsigned type, const char *label, unsigned action); +} menu_file_list_cbs_t; + +typedef struct menu_ctx_driver_backend +{ + int (*iterate)(unsigned); + const char *ident; +} menu_ctx_driver_backend_t; + +typedef struct menu_ctx_driver +{ + void (*set_texture)(void*); + void (*render_messagebox)(const char*); + void (*render)(void); + void (*frame)(void); + void* (*init)(void); + bool (*init_lists)(void*); + void (*free)(void*); + void (*context_reset)(void*); + void (*context_destroy)(void*); + void (*populate_entries)(void*, const char *, const char *, + unsigned); + void (*iterate)(void*, unsigned); + int (*input_postprocess)(uint64_t, uint64_t); + void (*navigation_clear)(void *, bool); + void (*navigation_decrement)(void *); + void (*navigation_increment)(void *); + void (*navigation_set)(void *, bool); + void (*navigation_set_last)(void *); + void (*navigation_descend_alphabet)(void *, size_t *); + void (*navigation_ascend_alphabet)(void *, size_t *); + void (*list_insert)(void *, const char *, const char *, size_t); + void (*list_delete)(void *, size_t, size_t); + void (*list_clear)(void *); + void (*list_cache)(bool, unsigned); + void (*list_set_selection)(void *); + void (*init_core_info)(void *); + void (*update_core_info)(void *); + + const menu_ctx_driver_backend_t *backend; + const char *ident; +} menu_ctx_driver_t; + #ifdef __cplusplus } #endif