mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Header cleanups

Browse Source
This commit is contained in:
libretroadmin 2023-05-11 05:45:04 +02:00
parent f2bb150b0a
commit 7db9a4acfa
10 changed files with 29 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/gfx_display.h
View File

@ -80,9 +80,7 @@ enum menu_driver_id_type
MENU_DRIVER_ID_RGUI,
MENU_DRIVER_ID_OZONE,
MENU_DRIVER_ID_GLUI,
MENU_DRIVER_ID_XMB,
MENU_DRIVER_ID_XUI,
MENU_DRIVER_ID_STRIPES
MENU_DRIVER_ID_XMB
};

1
menu/cbs/menu_cbs_info.c
View File

@ -17,7 +17,6 @@
#include "../menu_driver.h"
#include "../menu_cbs.h"
#include "../menu_dialog.h"
#include "../../configuration.h"
#include "../../audio/audio_driver.h"

1
menu/cbs/menu_cbs_ok.c
View File

@ -50,7 +50,6 @@
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "../menu_shader.h"
#endif
#include "../menu_dialog.h"
#include "../menu_input_bind_dialog.h"
#include "../menu_input.h"

28
menu/menu_defines.h
View File

@ -465,6 +465,34 @@ enum menu_screensaver_effect
MENU_SCREENSAVER_LAST
};
enum menu_dialog_type
{
MENU_DIALOG_NONE = 0,
MENU_DIALOG_WELCOME,
MENU_DIALOG_HELP_EXTRACT,
MENU_DIALOG_HELP_CONTROLS,
MENU_DIALOG_HELP_CHEEVOS_DESCRIPTION,
MENU_DIALOG_HELP_LOADING_CONTENT,
MENU_DIALOG_HELP_WHAT_IS_A_CORE,
MENU_DIALOG_HELP_CHANGE_VIRTUAL_GAMEPAD,
MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
MENU_DIALOG_HELP_SCANNING_CONTENT,
MENU_DIALOG_QUIT_CONFIRM,
MENU_DIALOG_INFORMATION,
MENU_DIALOG_QUESTION,
MENU_DIALOG_WARNING,
MENU_DIALOG_ERROR,
MENU_DIALOG_LAST
};
struct menu_dialog
{
unsigned current_id;
enum menu_dialog_type current_type;
bool pending_push;
};
typedef struct menu_dialog menu_dialog_t;
RETRO_END_DECLS

59
menu/menu_dialog.h
View File

@ -1,59 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2016-2019 - Brad Parker
*
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef _MENU_DIALOG_H
#define _MENU_DIALOG_H
#include <stdint.h>
#include <stdlib.h>
#include <boolean.h>
#include <retro_common_api.h>
#include "../msg_hash.h"
enum menu_dialog_type
{
MENU_DIALOG_NONE = 0,
MENU_DIALOG_WELCOME,
MENU_DIALOG_HELP_EXTRACT,
MENU_DIALOG_HELP_CONTROLS,
MENU_DIALOG_HELP_CHEEVOS_DESCRIPTION,
MENU_DIALOG_HELP_LOADING_CONTENT,
MENU_DIALOG_HELP_WHAT_IS_A_CORE,
MENU_DIALOG_HELP_CHANGE_VIRTUAL_GAMEPAD,
MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
MENU_DIALOG_HELP_SCANNING_CONTENT,
MENU_DIALOG_QUIT_CONFIRM,
MENU_DIALOG_INFORMATION,
MENU_DIALOG_QUESTION,
MENU_DIALOG_WARNING,
MENU_DIALOG_ERROR,
MENU_DIALOG_LAST
};
struct menu_dialog
{
unsigned current_id;
enum menu_dialog_type current_type;
bool pending_push;
};
typedef struct menu_dialog menu_dialog_t;
#endif

1
menu/menu_displaylist.c
View File

@ -83,7 +83,6 @@
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "menu_shader.h"
#endif
#include "menu_dialog.h"
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
#include "menu_screensaver.h"
#endif

2
menu/menu_driver.c
View File

@ -3856,8 +3856,6 @@ static enum menu_driver_id_type menu_driver_set_id(
return MENU_DRIVER_ID_GLUI;
else if (string_is_equal(driver_name, "xmb"))
return MENU_DRIVER_ID_XMB;
else if (string_is_equal(driver_name, "stripes"))
return MENU_DRIVER_ID_STRIPES;
}
return MENU_DRIVER_ID_UNKNOWN;
}

1
menu/menu_driver.h
View File

@ -34,7 +34,6 @@
#endif
#include "menu_defines.h"
#include "menu_dialog.h"
#include "menu_input.h"
#include "../input/input_osk.h"
#include "menu_input_bind_dialog.h"

2
menu/menu_input_bind_dialog.h
View File

@ -24,8 +24,6 @@
#include <retro_common_api.h>
#include "menu_input.h"
RETRO_BEGIN_DECLS
enum menu_input_binds_ctl_state

1
runloop.c
View File

@ -149,7 +149,6 @@
#include "menu/menu_cbs.h"
#include "menu/menu_driver.h"
#include "menu/menu_input.h"
#include "menu/menu_dialog.h"
#include "menu/menu_input_bind_dialog.h"
#endif