libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-02 23:14:34 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Remove menu_entries.c

Browse Source
This commit is contained in:
twinaphex 2015-05-12 13:14:04 +02:00
parent 372a4e2d6d
commit 42ee2606a1
23 changed files with 50 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -342,7 +342,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_setting.o \
menu/menu_database.o \
menu/menu_shader.o \
menu/menu_entries.o \
menu/menu_entries_cbs_ok.o \
menu/menu_entries_cbs_cancel.o \
menu/menu_entries_cbs_start.o \

1
griffin/griffin.c
View File

@ -716,7 +716,6 @@ MENU
#include "../menu/menu_common_list.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_list.c"
#include "../menu/menu_entries.c"
#include "../menu/menu_entries_cbs_ok.c"
#include "../menu/menu_entries_cbs_cancel.c"
#include "../menu/menu_entries_cbs_start.c"

1
menu/menu.c
View File

@ -17,7 +17,6 @@
#include "menu.h"
#include "menu_display.h"
#include "menu_entry.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "../dynamic.h"
#include "../frontend/frontend.h"

1
menu/menu_database.c
View File

@ -16,7 +16,6 @@
#include "menu.h"
#include "menu_database.h"
#include "menu_list.h"
#include "menu_entries.h"
#include "../playlist.h"
#include <string.h>

5
menu/menu_displaylist.c
View File

@ -22,10 +22,11 @@
#include "menu.h"
#include "menu_display.h"
#include "menu_entries.h"
#include "menu_displaylist.h"
#include "menu_navigation.h"
#include "../performance.h"
#include "../settings.h"
static void menu_displaylist_push_perfcounter(
menu_displaylist_info_t *info,
@ -346,7 +347,7 @@ static int menu_entries_push_list(menu_handle_t *menu,
continue;
menu_list_push(list, setting->short_description,
setting->name, menu_entries_setting_set_flags(setting), 0);
setting->name, menu_setting_set_flags(setting), 0);
}
menu_driver_populate_entries(path, label, type);

45
menu/menu_entries.c
View File

@ -1,45 +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 <http://www.gnu.org/licenses/>.
*/
#include "menu_displaylist.h"
#include "menu_entries.h"
#include "menu_setting.h"
#include "menu_navigation.h"
int menu_entries_setting_set_flags(rarch_setting_t *setting)
{
if (!setting)
return 0;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_SETTING_DRIVER;
switch (setting->type)
{
case ST_ACTION:
return MENU_SETTING_ACTION;
case ST_PATH:
return MENU_FILE_PATH;
case ST_GROUP:
return MENU_SETTING_GROUP;
case ST_SUB_GROUP:
return MENU_SETTING_SUBGROUP;
default:
break;
}
return 0;
}

38
menu/menu_entries.h
View File

@ -1,38 +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 <http://www.gnu.org/licenses/>.
*/
#ifndef MENU_ENTRIES_H__
#define MENU_ENTRIES_H__
#include <stdlib.h>
#include "menu.h"
#include <file/file_list.h>
#include "../settings.h"
#ifdef HAVE_LIBRETRODB
#include "menu_database.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
int menu_entries_setting_set_flags(rarch_setting_t *setting);
#ifdef __cplusplus
}
#endif
#endif

1
menu/menu_entries_cbs.c
View File

@ -18,7 +18,6 @@
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_input.h"
#include "menu_entries.h"
#include "menu_navigation.h"
#include <file/file_extract.h>

1
menu/menu_entries_cbs_cancel.c
View File

@ -18,7 +18,6 @@
#include "menu_entries_cbs.h"
#include "menu_list.h"
#include "menu_setting.h"
#include "menu_entries.h"
static int action_cancel_lookup_setting(const char *path,
const char *label, unsigned type, size_t idx)

6
menu/menu_entries_cbs_deferred_push.c
View File

@ -18,10 +18,10 @@
#include "menu_displaylist.h"
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_entries.h"
#include "../file_ext.h"
#include "../retroarch.h"
#include "../settings.h"
#include "../performance.h"
#ifdef HAVE_LIBRETRODB
@ -1287,7 +1287,7 @@ static int deferred_push_settings(void *data, void *userdata,
{
if (setting->type == ST_GROUP)
menu_list_push(list, setting->short_description,
setting->name, menu_entries_setting_set_flags(setting), 0);
setting->name, menu_setting_set_flags(setting), 0);
}
}
else
@ -1387,7 +1387,7 @@ static int deferred_push_settings_subgroup(void *data, void *userdata,
strlcpy(group_label, setting->name, sizeof(group_label));
menu_list_push(list, setting->short_description,
group_label, menu_entries_setting_set_flags(setting), 0);
group_label, menu_setting_set_flags(setting), 0);
}
menu_driver_populate_entries(path, label, type);

2
menu/menu_entries_cbs_iterate.c
View File

@ -20,11 +20,11 @@
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_input.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "menu_navigation.h"
#include "../retroarch.h"
#include "../settings.h"
#include "../input/input_autodetect.h"

1
menu/menu_entries_cbs_ok.c
View File

@ -17,7 +17,6 @@
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "menu_navigation.h"

1
menu/menu_entries_cbs_refresh.c
View File

@ -15,7 +15,6 @@
#include "menu.h"
#include "menu_displaylist.h"
#include "menu_entries.h"
#include "menu_entries_cbs.h"
static int action_refresh_default(file_list_t *list, file_list_t *menu_list)

3
menu/menu_entries_cbs_representation.c
View File

@ -16,10 +16,11 @@
#include <file/file_path.h>
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "menu_setting.h"
#include "../performance.h"
#include "../settings.h"
static void menu_action_setting_disp_set_label_cheat_num_passes(
file_list_t* list,

1
menu/menu_entries_cbs_select.c
View File

@ -14,7 +14,6 @@
*/
#include "menu.h"
#include "menu_entries.h"
#include "menu_entries_cbs.h"
static int action_select_default(unsigned type, const char *label,

1
menu/menu_entries_cbs_start.c
View File

@ -16,7 +16,6 @@
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "../retroarch.h"

1
menu/menu_entries_cbs_toggle.c
View File

@ -17,7 +17,6 @@
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_setting.h"
#include "menu_entries.h"
#include "menu_shader.h"
#include "menu_navigation.h"

1
menu/menu_entries_cbs_up_or_down.c
View File

@ -14,7 +14,6 @@
*/
#include "menu.h"
#include "menu_entries.h"
#include "menu_navigation.h"
#include "menu_entries_cbs.h"

7
menu/menu_list.c
View File

@ -14,13 +14,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <retro_inline.h>
#include "../driver.h"
#include "menu_common_list.h"
#include "menu_list.h"
#include "menu_navigation.h"
#include "menu_entries.h"
#include <string.h>
#include <retro_inline.h>
menu_list_t *menu_list_get_ptr(void)
{

27
menu/menu_setting.c
View File

@ -15,8 +15,33 @@
*/
#include "menu_setting.h"
#include "menu_entries.h"
#include "../retroarch.h"
#include "../settings.h"
int menu_setting_set_flags(rarch_setting_t *setting)
{
if (!setting)
return 0;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_SETTING_DRIVER;
switch (setting->type)
{
case ST_ACTION:
return MENU_SETTING_ACTION;
case ST_PATH:
return MENU_FILE_PATH;
case ST_GROUP:
return MENU_SETTING_GROUP;
case ST_SUB_GROUP:
return MENU_SETTING_SUBGROUP;
default:
break;
}
return 0;
}
int menu_setting_generic(rarch_setting_t *setting)
{

3
menu/menu_setting.h
View File

@ -17,12 +17,15 @@
#ifndef _MENU_SETTING_H
#define _MENU_SETTING_H
#include "menu.h"
#include "../settings_list.h"
#ifdef __cplusplus
extern "C" {
#endif
int menu_setting_set_flags(rarch_setting_t *setting);
int menu_setting_generic(rarch_setting_t *setting);
int menu_setting_handler(rarch_setting_t *setting, unsigned action);

9
menu/menu_shader.c
View File

@ -14,10 +14,15 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "menu_shader.h"
#include "menu_entries.h"
#include <string.h>
#include <compat/strl.h>
#include <file/file_path.h>
#include "menu_shader.h"
#include "../configuration.h"
#include "../runloop.h"
#include "../settings.h"
/**
* menu_shader_manager_init:

2
settings.c
View File

@ -36,7 +36,7 @@
#endif
#ifdef HAVE_MENU
#include "menu/menu_entries.h"
#include "menu/menu_setting.h"
#endif
/**