ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove old custom aspect ratio setting

This commit is contained in:
twinaphex 2015-09-27 20:02:28 +02:00
parent 797bea5756
commit bca4b67080
16 changed files with 1 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/cbs/menu_cbs_get_value.c
View File

@ -1126,7 +1126,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
menu_action_setting_disp_set_label_menu_file_cheat;
break;
case MENU_SETTING_SUBGROUP:
case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_CUSTOM_BIND_ALL:
case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL:
cbs->action_get_value =

27
menu/cbs/menu_cbs_ok.c
View File

@ -254,11 +254,6 @@ int generic_action_ok_displaylist_push(const char *path,
info_path = tmp;
info_label = menu_hash_to_str(MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST);
break;
case ACTION_OK_DL_CUSTOM_VIEWPORT:
info.type = MENU_SETTINGS_CUSTOM_VIEWPORT;
info.directory_ptr = idx;
info_label = menu_hash_to_str(MENU_LABEL_CUSTOM_VIEWPORT_1);
break;
case ACTION_OK_DL_CORE_UPDATER_LIST:
info.type = type;
info.directory_ptr = idx;
@ -1252,25 +1247,6 @@ static int action_ok_core_updater_list(const char *path,
#endif
static int action_ok_custom_viewport(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
settings_t *settings = config_get_ptr();
video_viewport_t *custom = video_viewport_get_custom();
int ret = generic_action_ok_displaylist_push(path,
label, type, idx, entry_idx, ACTION_OK_DL_CUSTOM_VIEWPORT);
video_driver_viewport_info(custom);
aspectratio_lut[ASPECT_RATIO_CUSTOM].value =
(float)custom->width / custom->height;
settings->video.aspect_ratio_idx = ASPECT_RATIO_CUSTOM;
event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO);
return ret;
}
static int action_ok_rdb_entry_submenu(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
@ -1880,9 +1856,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_CONFIGURATIONS:
cbs->action_ok = action_ok_configurations_list;
break;
case MENU_LABEL_CUSTOM_RATIO:
cbs->action_ok = action_ok_custom_viewport;
break;
case MENU_LABEL_SCREEN_RESOLUTION:
cbs->action_ok = action_ok_video_resolution;
break;

13
menu/cbs/menu_cbs_title.c
View File

@ -121,13 +121,6 @@ static int action_get_title_font_path(const char *path, const char *label,
return fill_title(s, "FONT", path, len);
}
static int action_get_title_custom_viewport(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
strlcpy(s, "CUSTOM VIEWPORT", len);
return 0;
}
static int action_get_title_video_shader_preset(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
@ -648,9 +641,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_REMAP_FILE_LOAD:
cbs->action_get_title = action_get_title_remap_file_load;
break;
case MENU_LABEL_CUSTOM_VIEWPORT_2:
cbs->action_get_title = action_get_title_custom_viewport;
break;
case MENU_LABEL_HELP:
cbs->action_get_title = action_get_title_help;
break;
@ -690,9 +680,6 @@ static int menu_cbs_init_bind_title_compare_type(menu_file_list_cbs_t *cbs,
{
switch (type)
{
case MENU_SETTINGS_CUSTOM_VIEWPORT:
cbs->action_get_title = action_get_title_custom_viewport;
break;
case MENU_SETTINGS:
cbs->action_get_title = action_get_title_menu;
break;

4
menu/intl/menu_hash_de.c
View File

@ -75,10 +75,6 @@ const char *menu_hash_to_str_de(uint32_t hash)
return "Spielstand-Einstellungen";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Zurückspul-Einstellungen";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Kalibriere obere, linke Ecke";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Kalibriere untere, rechte Ecke";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

4
menu/intl/menu_hash_es.c
View File

@ -132,10 +132,6 @@ const char *menu_hash_to_str_es(uint32_t hash)
return "Guardado";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Rebobinado";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Asignar esquina superior izquierda";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Asignar esquina inferior derecha";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

6
menu/intl/menu_hash_fr.c
View File

@ -86,12 +86,6 @@ const char *menu_hash_to_str_fr(uint32_t hash)
return "Réglages des sauvegardes";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Réglages du rembobinage";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Modifier le coin haut-gauche";
case MENU_LABEL_CUSTOM_VIEWPORT_2:
return "custom_viewport_2";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Modifier le coin bas-droite";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

4
menu/intl/menu_hash_nl.c
View File

@ -121,10 +121,6 @@ const char *menu_hash_to_str_nl(uint32_t hash)
return "Saving";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Rewind";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Bovenlinkse Hoek Instellen";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Benedenrechtse hoek instellen";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

4
menu/intl/menu_hash_pl.c
View File

@ -85,10 +85,6 @@ const char *menu_hash_to_str_pl(uint32_t hash)
return "Ustawienia zapisywania";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Ustawienia przewijania";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Ustaw lewy górny róg";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Ustaw prawy dolny róg";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

4
menu/intl/menu_hash_pt.c
View File

@ -75,10 +75,6 @@ const char *menu_hash_to_str_pt(uint32_t hash)
return "Saves";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Retrocesso";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Definir Quina Superior Esquerda";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Definir Quina Inferior Direita";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

8
menu/intl/menu_hash_us.c
View File

@ -92,10 +92,6 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "load_content";
case MENU_LABEL_NO_SETTINGS_FOUND:
return "menu_label_no_settings_found";
case MENU_LABEL_CUSTOM_VIEWPORT_1:
return "custom_viewport_1";
case MENU_LABEL_CUSTOM_VIEWPORT_2:
return "custom_viewport_2";
case MENU_LABEL_SYSTEM_BGM_ENABLE:
return "system_bgm_enable";
case MENU_LABEL_AUDIO_BLOCK_FRAMES:
@ -748,10 +744,6 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Saving";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Rewind";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Set Upper-Left Corner";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Set Bottom-Right Corner";
case MENU_VALUE_SHADER:
return "Shader";
case MENU_VALUE_CHEAT:

8
menu/intl/menu_hash_uspseudo.c
View File

@ -93,10 +93,6 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "load_content";
case MENU_LABEL_NO_SETTINGS_FOUND:
return "menu_label_no_settings_found";
case MENU_LABEL_CUSTOM_VIEWPORT_1:
return "custom_viewport_1";
case MENU_LABEL_CUSTOM_VIEWPORT_2:
return "custom_viewport_2";
case MENU_LABEL_SYSTEM_BGM_ENABLE:
return "system_bgm_enable";
case MENU_LABEL_AUDIO_BLOCK_FRAMES:
@ -747,10 +743,6 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Sàving";
case MENU_LABEL_VALUE_REWIND_SETTINGS:
return "Rewind";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1:
return "Set Üpper-Left Çorñèr";
case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2:
return "Sèt Bøttom-Right Çòrner";
case MENU_VALUE_SHADER:
return "Shâder";
case MENU_VALUE_CHEAT:

2
menu/menu.h
View File

@ -119,7 +119,7 @@ typedef enum
typedef enum
{
MENU_SETTINGS_CUSTOM_VIEWPORT = MENU_FILE_TYPE_T_LAST + 1,
MENU_SETTINGS_NONE = MENU_FILE_TYPE_T_LAST + 1,
MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1),
MENU_SETTINGS_SHADER_PRESET_PARAMETER_0,

1
menu/menu_cbs.h
View File

@ -55,7 +55,6 @@ enum
ACTION_OK_DL_DIRECTORY_PUSH,
ACTION_OK_DL_DATABASE_MANAGER_LIST,
ACTION_OK_DL_CURSOR_MANAGER_LIST,
ACTION_OK_DL_CUSTOM_VIEWPORT,
ACTION_OK_DL_CORE_UPDATER_LIST,
ACTION_OK_DL_CORE_CONTENT_LIST,
ACTION_OK_DL_DEFERRED_CORE_LIST,

4
menu/menu_hash.h
View File

@ -697,10 +697,6 @@ extern "C" {
#define MENU_LABEL_MESSAGE 0xbe463eeaU
#define MENU_LABEL_INFO_SCREEN 0xd97853d0U
#define MENU_LABEL_LOAD_OPEN_ZIP 0x8aa3c068U
#define MENU_LABEL_CUSTOM_VIEWPORT_1 0x76c3016fU
#define MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1 0xdeef977eU
#define MENU_LABEL_CUSTOM_VIEWPORT_2 0x76c30170U
#define MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2 0x1d76c99aU
#define MENU_LABEL_CUSTOM_RATIO 0xf038731eU
#define MENU_LABEL_VALUE_CUSTOM_RATIO 0x3c94b73fU
#define MENU_LABEL_HELP 0x7c97d2eeU

181
menu/menu_iterate.c
View File

@ -42,7 +42,6 @@ enum action_iterate_type
ITERATE_TYPE_DEFAULT = 0,
ITERATE_TYPE_HELP,
ITERATE_TYPE_INFO,
ITERATE_TYPE_VIEWPORT,
ITERATE_TYPE_BIND
};
@ -205,179 +204,6 @@ static int action_iterate_info(char *s, size_t len, const char *label)
return menu_hash_get_help(label_hash, s, len);
}
static int action_iterate_menu_viewport(char *s, size_t len,
const char *label, unsigned action, uint32_t hash)
{
size_t selection;
int stride_x, stride_y;
menu_displaylist_info_t info = {0};
struct retro_game_geometry *geom = NULL;
const char *base_msg = NULL;
unsigned type = 0;
video_viewport_t *custom = video_viewport_get_custom();
menu_list_t *menu_list = menu_list_get_ptr();
settings_t *settings = config_get_ptr();
struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
if (!menu_list || !menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return -1;
menu_list_get_last_stack(menu_list, NULL, NULL, &type, NULL);
geom = (struct retro_game_geometry*)&av_info->geometry;
stride_x = settings->video.scale_integer ? geom->base_width : 1;
stride_y = settings->video.scale_integer ? geom->base_height : 1;
switch (action)
{
case MENU_ACTION_UP:
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{
custom->y -= stride_y;
custom->height += stride_y;
}
else if (custom->height >= (unsigned)stride_y)
custom->height -= stride_y;
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
break;
case MENU_ACTION_DOWN:
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{
custom->y += stride_y;
if (custom->height >= (unsigned)stride_y)
custom->height -= stride_y;
}
else
custom->height += stride_y;
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
break;
case MENU_ACTION_LEFT:
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{
custom->x -= stride_x;
custom->width += stride_x;
}
else if (custom->width >= (unsigned)stride_x)
custom->width -= stride_x;
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
break;
case MENU_ACTION_RIGHT:
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{
custom->x += stride_x;
if (custom->width >= (unsigned)stride_x)
custom->width -= stride_x;
}
else
custom->width += stride_x;
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
break;
case MENU_ACTION_CANCEL:
menu_entry_go_back();
if (hash == MENU_LABEL_CUSTOM_VIEWPORT_2)
{
info.list = menu_list->menu_stack;
info.type = MENU_SETTINGS_CUSTOM_VIEWPORT;
info.directory_ptr = selection;
menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
}
break;
case MENU_ACTION_OK:
menu_list_flush_stack(menu_list, NULL, 49);
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT
&& !settings->video.scale_integer)
{
info.list = menu_list->menu_stack;
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_CUSTOM_VIEWPORT_2),
sizeof(info.label));
info.type = 0;
info.directory_ptr = selection;
menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
}
break;
case MENU_ACTION_START:
if (!settings->video.scale_integer)
{
video_viewport_t vp;
video_driver_viewport_info(&vp);
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
{
custom->width += custom->x;
custom->height += custom->y;
custom->x = 0;
custom->y = 0;
}
else
{
custom->width = vp.full_width - custom->x;
custom->height = vp.full_height - custom->y;
}
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
}
break;
default:
break;
}
menu_list_get_last_stack(menu_list, NULL, &label, &type, NULL);
if (settings->video.scale_integer)
{
custom->x = 0;
custom->y = 0;
custom->width = ((custom->width + geom->base_width - 1) /
geom->base_width) * geom->base_width;
custom->height = ((custom->height + geom->base_height - 1) /
geom->base_height) * geom->base_height;
base_msg = "Set scale";
snprintf(s, len, "%s (%4ux%4u, %u x %u scale)",
base_msg,
custom->width, custom->height,
custom->width / geom->base_width,
custom->height / geom->base_height);
}
else
{
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT)
base_msg = menu_hash_to_str(MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1);
else if (hash == MENU_LABEL_CUSTOM_VIEWPORT_2)
base_msg = menu_hash_to_str(MENU_LABEL_VALUE_CUSTOM_VIEWPORT_2);
snprintf(s, len, "%s (%d, %d : %4ux%4u)",
base_msg, custom->x, custom->y, custom->width, custom->height);
}
if (!custom->width)
custom->width = stride_x;
if (!custom->height)
custom->height = stride_y;
aspectratio_lut[ASPECT_RATIO_CUSTOM].value =
(float)custom->width / custom->height;
event_command(EVENT_CMD_VIDEO_APPLY_STATE_CHANGES);
return 0;
}
static enum action_iterate_type action_iterate_type(uint32_t hash)
{
switch (hash)
@ -392,9 +218,6 @@ static enum action_iterate_type action_iterate_type(uint32_t hash)
return ITERATE_TYPE_HELP;
case MENU_LABEL_INFO_SCREEN:
return ITERATE_TYPE_INFO;
case MENU_LABEL_CUSTOM_VIEWPORT_1:
case MENU_LABEL_CUSTOM_VIEWPORT_2:
return ITERATE_TYPE_VIEWPORT;
case MENU_LABEL_CUSTOM_BIND:
case MENU_LABEL_CUSTOM_BIND_ALL:
case MENU_LABEL_CUSTOM_BIND_DEFAULTS:
@ -463,10 +286,6 @@ int menu_iterate(bool render_this_frame, unsigned action)
else
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
break;
case ITERATE_TYPE_VIEWPORT:
ret = action_iterate_menu_viewport(menu->menu_state.msg, sizeof(menu->menu_state.msg), label, action, hash);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
break;
case ITERATE_TYPE_INFO:
ret = action_iterate_info(menu->menu_state.msg, sizeof(menu->menu_state.msg), label);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);

7
menu/menu_setting.c
View File

@ -3574,13 +3574,6 @@ static bool setting_append_list_video_options(
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_aspect_ratio_index;
CONFIG_ACTION(
menu_hash_to_str(MENU_LABEL_CUSTOM_RATIO),
menu_hash_to_str(MENU_LABEL_VALUE_CUSTOM_RATIO),
group_info.name,
subgroup_info.name,
parent_group);
CONFIG_INT(
settings->video_viewport_custom.x,
"video_viewport_custom_x",