From c54ecf9bec00760c16ec7c5f177935ba8d5c61ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Jun 2015 15:35:56 +0200 Subject: [PATCH] (menu_setting.c) More cleanups --- menu/menu_hash.h | 10 +++- menu/menu_setting.c | 124 +++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 68 deletions(-) diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 1ff8f6d1c8..83ae5724b3 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -20,18 +20,24 @@ extern "C" { #endif +#define MENU_LABEL_REWIND_GRANULARITY 0xe859cbdfU +#define MENU_LABEL_VIDEO_THREADED 0x0626179cU +#define MENU_LABEL_VIDEO_VSYNC 0x09c2d34eU +#define MENU_LABEL_VIDEO_HARD_SYNC 0xdcd623b6U +#define MENU_LABEL_SAVESTATE_AUTO_SAVE 0xf6f4a05bU +#define MENU_LABEL_SYSTEM_DIRECTORY 0x35a6fb9eU +#define MENU_LABEL_VIDEO_DISABLE_COMPOSITION 0x5cbb6222U #define MENU_LABEL_VOLUME_UP 0xa66e9681U #define MENU_LABEL_VOLUME_DOWN 0xfc64f3d4U - #define MENU_LABEL_LOG_VERBOSITY 0x6648c96dU #define MENU_LABEL_OVERLAY_NEXT 0x7a459145U #define MENU_LABEL_AUDIO_VOLUME 0x502173aeU #define MENU_LABEL_AUDIO_LATENCY 0x32695386U - #define MENU_LABEL_NETPLAY_DELAY_FRAMES 0x86b2c48dU #define MENU_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE 0x6f9a9440U #define MENU_LABEL_NETPLAY_IP_ADDRESS 0xac9a53ffU #define MENU_LABEL_NETPLAY_MODE 0xc1cf6506U +#define MENU_LABEL_PERFCNT_ENABLE 0x6823dbddU #define MENU_LABEL_PAL60_ENABLE 0x62bc416eU #define MENU_LABEL_SYSTEM_BGM_ENABLE 0x9287a1c5U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index c379620192..90d9a0ea2e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2602,6 +2602,63 @@ static int setting_get_description_compare_label(uint32_t label_hash, snprintf(s, len, " -- Decreases audio volume."); break; + case MENU_LABEL_VIDEO_DISABLE_COMPOSITION: + snprintf(s, len, + "-- Forcibly disable composition.\n" + "Only valid on Windows Vista/7 for now."); + break; + case MENU_LABEL_PERFCNT_ENABLE: + snprintf(s, len, + "-- Enable or disable frontend \n" + "performance counters."); + break; + case MENU_LABEL_SYSTEM_DIRECTORY: + snprintf(s, len, + "-- System Directory. \n" + " \n" + "Sets the 'system' directory.\n" + "Cores can query for this\n" + "directory to load BIOSes, \n" + "system-specific configs, etc."); + break; + case MENU_LABEL_SAVESTATE_AUTO_SAVE: + snprintf(s, len, + " -- Automatically saves a savestate at the \n" + "end of RetroArch's lifetime.\n" + " \n" + "RetroArch will automatically load any savestate\n" + "with this path on startup if 'Auto Load State\n" + "is enabled."); + break; + case MENU_LABEL_VIDEO_THREADED: + snprintf(s, len, + " -- Use threaded video driver.\n" + " \n" + "Using this might improve performance at \n" + "possible cost of latency and more video \n" + "stuttering."); + break; + case MENU_LABEL_VIDEO_VSYNC: + snprintf(s, len, + " -- Video V-Sync.\n"); + break; + case MENU_LABEL_VIDEO_HARD_SYNC: + snprintf(s, len, + " -- Attempts to hard-synchronize \n" + "CPU and GPU.\n" + " \n" + "Can reduce latency at cost of \n" + "performance."); + break; + case MENU_LABEL_REWIND_GRANULARITY: + snprintf(s, len, + " -- Rewind granularity.\n" + " \n" + " When rewinding defined number of \n" + "frames, you can rewind several frames \n" + "at a time, increasing the rewinding \n" + "speed."); + break; default: return -1; } @@ -2630,29 +2687,7 @@ int setting_get_description(const char *label, char *s, if (setting_get_description_compare_label(label_hash, settings, s, len) == 0) return 0; - if (!strcmp(label, "video_disable_composition")) - { - snprintf(s, len, - "-- Forcibly disable composition.\n" - "Only valid on Windows Vista/7 for now."); - } - else if (!strcmp(label, "perfcnt_enable")) - { - snprintf(s, len, - "-- Enable or disable frontend \n" - "performance counters."); - } - else if (!strcmp(label, "system_directory")) - { - snprintf(s, len, - "-- System Directory. \n" - " \n" - "Sets the 'system' directory.\n" - "Cores can query for this\n" - "directory to load BIOSes, \n" - "system-specific configs, etc."); - } - else if (!strcmp(label, "rgui_show_start_screen")) + if (!strcmp(label, "rgui_show_start_screen")) { snprintf(s, len, " -- Show startup screen in menu.\n" @@ -2668,20 +2703,6 @@ int setting_get_description(const char *label, char *s, " -- Load up a specific config file \n" "based on the core being used.\n"); } - else if (!strcmp(label, "video_vsync")) - { - snprintf(s, len, - " -- Video V-Sync.\n"); - } - else if (!strcmp(label, "video_hard_sync")) - { - snprintf(s, len, - " -- Attempts to hard-synchronize \n" - "CPU and GPU.\n" - " \n" - "Can reduce latency at cost of \n" - "performance."); - } else if (!strcmp(label, "video_hard_sync_frames")) { snprintf(s, len, @@ -2724,15 +2745,6 @@ int setting_get_description(const char *label, char *s, "configured as if it is a 60 Hz monitor \n" "(divide refresh rate by 2)."); } - else if (!strcmp(label, "video_threaded")) - { - snprintf(s, len, - " -- Use threaded video driver.\n" - " \n" - "Using this might improve performance at \n" - "possible cost of latency and more video \n" - "stuttering."); - } else if (!strcmp(label, "block_sram_overwrite")) { snprintf(s, len, @@ -2836,16 +2848,6 @@ int setting_get_description(const char *label, char *s, "buttons toggle." ); } - else if (!strcmp(label, "rewind_granularity")) - { - snprintf(s, len, - " -- Rewind granularity.\n" - " \n" - " When rewinding defined number of \n" - "frames, you can rewind several frames \n" - "at a time, increasing the rewinding \n" - "speed."); - } else if (!strcmp(label, "input_autodetect_enable")) { snprintf(s, len, @@ -2866,16 +2868,6 @@ int setting_get_description(const char *label, char *s, " -- Allow or disallow location services \n" "access by cores."); } - else if (!strcmp(label, "savestate_auto_save")) - { - snprintf(s, len, - " -- Automatically saves a savestate at the \n" - "end of RetroArch's lifetime.\n" - " \n" - "RetroArch will automatically load any savestate\n" - "with this path on startup if 'Auto Load State\n" - "is enabled."); - } else if ( !strcmp(label, "l_x_plus") || !strcmp(label, "l_x_minus") ||