From 02e01e0b0a5c6ca04cc781b1fd8ecb227c4c9c3f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 15 Sep 2016 00:20:43 +0200 Subject: [PATCH] Create menu/widgets/menu_entry --- Makefile.common | 2 +- griffin/griffin.c | 2 +- menu/cbs/menu_cbs_scan.c | 1 - menu/cbs/menu_cbs_select.c | 2 +- menu/drivers/xmb.c | 2 +- menu/drivers/xui.cpp | 2 +- menu/drivers/zarch.c | 2 +- menu/menu_displaylist.h | 1 + menu/menu_driver.h | 2 ++ menu/menu_entries.c | 5 +++-- menu/menu_entries.h | 3 +-- menu/menu_input.c | 2 +- menu/{ => widgets}/menu_entry.c | 4 ++-- menu/{ => widgets}/menu_entry.h | 4 +++- 14 files changed, 19 insertions(+), 15 deletions(-) rename menu/{ => widgets}/menu_entry.c (99%) rename menu/{ => widgets}/menu_entry.h (98%) diff --git a/Makefile.common b/Makefile.common index b18a87f367..17091118c3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -505,12 +505,12 @@ ifeq ($(HAVE_MENU_COMMON), 1) OBJ += menu/menu_driver.o \ menu/menu_content.o \ menu/menu_input.o \ - menu/menu_entry.o \ menu/menu_entries.o \ menu/menu_navigation.o \ menu/menu_setting.o \ menu/menu_shader.o \ menu/widgets/menu_popup.o \ + menu/widgets/menu_entry.o \ menu/widgets/menu_list.o \ menu/menu_cbs.o \ menu/cbs/menu_cbs_ok.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index ecff6a10c5..74839e79c3 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -888,11 +888,11 @@ MENU #ifdef HAVE_MENU #include "../menu/menu_driver.c" #include "../menu/menu_input.c" -#include "../menu/menu_entry.c" #include "../menu/menu_entries.c" #include "../menu/menu_setting.c" #include "../menu/menu_cbs.c" #include "../menu/menu_content.c" +#include "../menu/widgets/menu_entry.c" #include "../menu/widgets/menu_popup.c" #include "../menu/widgets/menu_list.c" #include "../menu/cbs/menu_cbs_ok.c" diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 844b4292ad..d47da9047f 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -22,7 +22,6 @@ #include "../menu_driver.h" #include "../menu_cbs.h" -#include "../menu_entry.h" #include "../menu_setting.h" #include "../../configuration.h" diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index bb85faa76f..39c06eff57 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -20,7 +20,7 @@ #endif #include "../menu_driver.h" -#include "../menu_entry.h" +#include "../widgets/menu_entry.h" #include "../menu_cbs.h" #include "../menu_setting.h" diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 13172bee3a..67eabc1d88 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -36,7 +36,7 @@ #include "menu_generic.h" #include "../menu_driver.h" -#include "../menu_entry.h" +#include "../widgets/menu_entry.h" #include "../menu_animation.h" #include "../menu_display.h" #include "../menu_display.h" diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 50c3c7ee62..eab675ffe3 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -32,7 +32,7 @@ #include "../menu_driver.h" #include "../menu_animation.h" -#include "../menu_entry.h" +#include "../widgets/menu_entry.h" #include "../menu_entries.h" #include "../menu_input.h" #include "../menu_navigation.h" diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 61559c37c7..ebbe6ba753 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -41,7 +41,7 @@ #include "../menu_driver.h" #include "../menu_animation.h" -#include "../menu_entry.h" +#include "../widgets/menu_entry.h" #include "../menu_display.h" #include "../menu_navigation.h" #include "../../retroarch.h" diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 452481a657..3359d8dfc5 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 21a0ea83a5..3b85383e12 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -26,6 +26,8 @@ #include #include +#include "widgets/menu_entry.h" +#include "menu_input.h" #include "menu_entries.h" #include "../gfx/video_shader_driver.h" diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 7db963b2d5..3dbdbf38bf 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -292,14 +292,15 @@ size_t menu_entries_get_end(void) } /* Get an entry from the top of the menu stack */ -void menu_entries_get(size_t i, menu_entry_t *entry) +void menu_entries_get(size_t i, void *entry_data) { const char *label = NULL; const char *path = NULL; const char *entry_label = NULL; menu_file_list_cbs_t *cbs = NULL; enum msg_hash_enums enum_idx = MSG_UNKNOWN; - file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); + menu_entry_t *entry = (menu_entry_t*)entry_data; + file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); menu_entries_get_last_stack(NULL, &label, NULL, &enum_idx, NULL); diff --git a/menu/menu_entries.h b/menu/menu_entries.h index f2ae7f0ab3..bfb5daa565 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -23,7 +23,6 @@ #include #include "menu_setting.h" -#include "menu_entry.h" #include "menu_displaylist.h" RETRO_BEGIN_DECLS @@ -132,7 +131,7 @@ typedef struct menu_file_list_cbs size_t menu_entries_get_end(void); -void menu_entries_get(size_t i, menu_entry_t *entry); +void menu_entries_get(size_t i, void *data_entry); int menu_entries_get_title(char *title, size_t title_len); diff --git a/menu/menu_input.c b/menu/menu_input.c index 15b1d53cd1..5a9e302469 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -39,7 +39,7 @@ #include "menu_input.h" #include "menu_animation.h" #include "menu_display.h" -#include "menu_entry.h" +#include "widgets/menu_entry.h" #include "menu_setting.h" #include "menu_shader.h" #include "menu_navigation.h" diff --git a/menu/menu_entry.c b/menu/widgets/menu_entry.c similarity index 99% rename from menu/menu_entry.c rename to menu/widgets/menu_entry.c index c9ad9f4949..39b5dc91fa 100644 --- a/menu/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -18,8 +18,8 @@ #include #include -#include "menu_driver.h" -#include "menu_navigation.h" +#include "../menu_driver.h" +#include "../menu_navigation.h" /* This file provides an abstraction of the currently displayed * menu. diff --git a/menu/menu_entry.h b/menu/widgets/menu_entry.h similarity index 98% rename from menu/menu_entry.h rename to menu/widgets/menu_entry.h index 7722b4eba0..8234d28134 100644 --- a/menu/menu_entry.h +++ b/menu/widgets/menu_entry.h @@ -22,7 +22,9 @@ #include #include -#include "menu_input.h" +#include "../../msg_hash.h" + +#include "../menu_input.h" RETRO_BEGIN_DECLS