mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) refactor more settings labels

Browse Source
This commit is contained in:
twinaphex 2014-08-20 18:57:07 +02:00
parent 1584239234
commit a4615dc48c
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/menu/backend/menu_common_backend.c
View File

@ -3737,9 +3737,7 @@ static void menu_common_setting_set_label(char *type_str,
input_get_bind_string(type_str, &g_settings.input.binds[driver.menu->current_pad][type - MENU_SETTINGS_BIND_BEGIN], auto_bind, type_str_size); input_get_bind_string(type_str, &g_settings.input.binds[driver.menu->current_pad][type - MENU_SETTINGS_BIND_BEGIN], auto_bind, type_str_size);
} }
else if (setting && setting->type == ST_BOOL) else if (setting && setting->type == ST_BOOL)
{
strlcpy(type_str, *setting->value.boolean ? "ON" : "OFF", type_str_size); strlcpy(type_str, *setting->value.boolean ? "ON" : "OFF", type_str_size);
}
else else
{ {
if (setting && !strcmp(setting->name, "video_rotation")) if (setting && !strcmp(setting->name, "video_rotation"))
@ -3768,6 +3766,12 @@ static void menu_common_setting_set_label(char *type_str,
snprintf(type_str, type_str_size, "%.1f", *setting->value.fraction); snprintf(type_str, type_str_size, "%.1f", *setting->value.fraction);
else if (setting && !strcmp(setting->name, "netplay_nickname")) else if (setting && !strcmp(setting->name, "netplay_nickname"))
snprintf(type_str, type_str_size, "%s", setting->value.string); snprintf(type_str, type_str_size, "%s", setting->value.string);
else if (setting && !strcmp(setting->name, "netplay_delay_frames"))
snprintf(type_str, type_str_size, "%d", *setting->value.unsigned_integer);
else if (setting && !strcmp(setting->name, "aspect_ratio_index"))
strlcpy(type_str, aspectratio_lut[*setting->value.unsigned_integer].name, type_str_size);
else if (setting && !strcmp(setting->name, "audio_rate_control_delta"))
snprintf(type_str, type_str_size, "%.3f", *setting->value.fraction);
else else
{ {
switch (type) switch (type)
@ -3823,9 +3827,6 @@ static void menu_common_setting_set_label(char *type_str,
strlcpy(type_str, "N/A", type_str_size); strlcpy(type_str, "N/A", type_str_size);
break; break;
} }
case MENU_SETTINGS_VIDEO_ASPECT_RATIO:
strlcpy(type_str, aspectratio_lut[g_settings.video.aspect_ratio_idx].name, type_str_size);
break;
#if defined(GEKKO) #if defined(GEKKO)
case MENU_SETTINGS_VIDEO_RESOLUTION: case MENU_SETTINGS_VIDEO_RESOLUTION:
strlcpy(type_str, gx_get_video_mode(), type_str_size); strlcpy(type_str, gx_get_video_mode(), type_str_size);
@ -3889,9 +3890,6 @@ static void menu_common_setting_set_label(char *type_str,
case MENU_SETTINGS_AUDIO_LATENCY: case MENU_SETTINGS_AUDIO_LATENCY:
snprintf(type_str, type_str_size, "%d ms", g_settings.audio.latency); snprintf(type_str, type_str_size, "%d ms", g_settings.audio.latency);
break; break;
case MENU_SETTINGS_AUDIO_CONTROL_RATE_DELTA:
snprintf(type_str, type_str_size, "%.3f", g_settings.audio.rate_control_delta);
break;
case MENU_SETTINGS_FASTFORWARD_RATIO: case MENU_SETTINGS_FASTFORWARD_RATIO:
if (g_settings.fastforward_ratio > 0.0f) if (g_settings.fastforward_ratio > 0.0f)
snprintf(type_str, type_str_size, "%.1fx", g_settings.fastforward_ratio); snprintf(type_str, type_str_size, "%.1fx", g_settings.fastforward_ratio);
@ -4130,9 +4128,6 @@ static void menu_common_setting_set_label(char *type_str,
case MENU_SETTINGS_NETPLAY_HOST_IP_ADDRESS: case MENU_SETTINGS_NETPLAY_HOST_IP_ADDRESS:
strlcpy(type_str, g_extern.netplay_server, type_str_size); strlcpy(type_str, g_extern.netplay_server, type_str_size);
break; break;
case MENU_SETTINGS_NETPLAY_DELAY_FRAMES:
snprintf(type_str, type_str_size, "%d", g_extern.netplay_sync_frames);
break;
case MENU_SETTINGS_NETPLAY_TCP_UDP_PORT: case MENU_SETTINGS_NETPLAY_TCP_UDP_PORT:
snprintf(type_str, type_str_size, "%d", g_extern.netplay_port ? g_extern.netplay_port : RARCH_DEFAULT_PORT); snprintf(type_str, type_str_size, "%d", g_extern.netplay_port ? g_extern.netplay_port : RARCH_DEFAULT_PORT);
break; break;

2
settings_data.c
View File

@ -1612,7 +1612,7 @@ rarch_setting_t* setting_data_get_list(void)
CONFIG_STRING(g_settings.video.gl_context, "video_gl_context", "OpenGL Context Driver", "", GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.video.gl_context, "video_gl_context", "OpenGL Context Driver", "", GROUP_NAME, SUBGROUP_NAME, NULL, NULL)
#endif #endif
CONFIG_STRING(g_settings.audio.driver, "audio_driver", "Audio Driver", config_get_default_audio(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.audio.driver, "audio_driver", "Audio Driver", config_get_default_audio(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL)
CONFIG_STRING(g_settings.audio.resampler, "audio_driver", "Audio Resampler Driver", config_get_default_audio_resampler(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.audio.resampler, "audio_resampler_driver", "Audio Resampler Driver", config_get_default_audio_resampler(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL)
CONFIG_STRING(g_settings.camera.device, "camera_device", "Camera Driver", config_get_default_camera(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.camera.device, "camera_device", "Camera Driver", config_get_default_camera(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL)
CONFIG_STRING(g_settings.location.driver, "location_driver", "Location Driver", config_get_default_location(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.location.driver, "location_driver", "Location Driver", config_get_default_location(), GROUP_NAME, SUBGROUP_NAME, NULL, NULL)
CONFIG_STRING(g_settings.input.joypad_driver, "input_joypad_driver", "Joypad Driver", "", GROUP_NAME, SUBGROUP_NAME, NULL, NULL) CONFIG_STRING(g_settings.input.joypad_driver, "input_joypad_driver", "Joypad Driver", "", GROUP_NAME, SUBGROUP_NAME, NULL, NULL)