diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 329cc6f86d..db20c52547 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -22,7 +22,6 @@ #include "../../config.h" #endif -#include "../menu_content.h" #include "../menu_driver.h" #include "../menu_entries.h" #include "../menu_cbs.h" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index b6c157d7af..35a9c6038a 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -52,7 +52,6 @@ #include "../widgets/menu_input_bind_dialog.h" #include "../menu_input.h" #include "../menu_networking.h" -#include "../menu_content.h" #include "../../core.h" #include "../../configuration.h" diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index f001fe838c..b8b3cf3561 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -22,7 +22,6 @@ #include "../../config.h" #endif -#include "../menu_content.h" #include "../menu_driver.h" #include "../menu_entries.h" #include "../menu_cbs.h" diff --git a/menu/menu_content.h b/menu/menu_content.h deleted file mode 100644 index bac1c4220d..0000000000 --- a/menu/menu_content.h +++ /dev/null @@ -1,39 +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 . - */ - -#ifndef __MENU_CONTENT_H__ -#define __MENU_CONTENT_H__ - -#include -#include - -#include -#include - -RETRO_BEGIN_DECLS - -typedef struct menu_content_ctx_defer_info -{ - void *data; - const char *dir; - const char *path; - const char *menu_label; - char *s; - size_t len; -} menu_content_ctx_defer_info_t; - -RETRO_END_DECLS - -#endif diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e791e14b52..3c9e5815f0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -68,7 +68,6 @@ #endif #include "menu_cbs.h" -#include "menu_content.h" #include "menu_driver.h" #include "menu_entries.h" #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 5670e5ffe6..da4debff16 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -208,7 +208,6 @@ enum menu_settings_type MENU_SETTINGS_LAST }; - typedef struct menu_ctx_driver { /* Set a framebuffer texture. This is used for instance by RGUI. */ @@ -323,6 +322,16 @@ typedef struct void *userdata; } menu_handle_t; +typedef struct menu_content_ctx_defer_info +{ + void *data; + const char *dir; + const char *path; + const char *menu_label; + char *s; + size_t len; +} menu_content_ctx_defer_info_t; + typedef struct menu_ctx_displaylist { menu_displaylist_info_t *info; diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index 2bf98f64b7..be8cd9cbcf 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ 05A8C52D20DB72F000FF7857 /* menu_cbs_up.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_cbs_up.c; sourceTree = ""; }; 05A8C52E20DB72F000FF7857 /* gfx_animation.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gfx_animation.c; sourceTree = ""; }; 05A8C52F20DB72F000FF7857 /* menu_displaylist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu_displaylist.h; sourceTree = ""; }; - 05A8C53020DB72F000FF7857 /* menu_content.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu_content.h; sourceTree = ""; }; 05A8C53220DB72F000FF7857 /* xmb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xmb.c; sourceTree = ""; }; 05A8C53B20DB72F000FF7857 /* xui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = xui.cpp; sourceTree = ""; }; 05A8C53C20DB72F000FF7857 /* rgui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = rgui.c; sourceTree = ""; }; @@ -205,7 +204,6 @@ 05A8C54520DB72F000FF7857 /* menu_entries.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_entries.c; sourceTree = ""; }; 05A8C54620DB72F000FF7857 /* menu_setting.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_setting.c; sourceTree = ""; }; 05A8C54720DB72F000FF7857 /* menu_input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_input.c; sourceTree = ""; }; - 05A8C54820DB72F000FF7857 /* menu_content.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_content.c; sourceTree = ""; }; 05A8C54920DB72F000FF7857 /* menu_displaylist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_displaylist.c; sourceTree = ""; }; 05A8C54A20DB72F000FF7857 /* menu_shader.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu_shader.c; sourceTree = ""; }; 05A8C54B20DB72F000FF7857 /* gfx_animation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gfx_animation.h; sourceTree = ""; }; @@ -761,8 +759,6 @@ 05A8C54B20DB72F000FF7857 /* gfx_animation.h */, 05A8C54120DB72F000FF7857 /* menu_cbs.c */, 05A8C54C20DB72F000FF7857 /* menu_cbs.h */, - 05A8C54820DB72F000FF7857 /* menu_content.c */, - 05A8C53020DB72F000FF7857 /* menu_content.h */, 05A8C54920DB72F000FF7857 /* menu_displaylist.c */, 05A8C52F20DB72F000FF7857 /* menu_displaylist.h */, 05A8C54D20DB72F000FF7857 /* menu_driver.c */,