mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_setting.c) Cleanups

Browse Source
This commit is contained in:
Twinaphex 2015-06-05 16:33:49 +02:00
parent a8f027ba9b
commit 439de844b4
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretro-common/utils/md5.c
View File

@ -492,7 +492,7 @@ static void MDTestSuite(void)
MDFile ("foo"); MDFile ("foo");
} }
void main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
int i; int i;
@ -514,6 +514,8 @@ void main (int argc, char *argv[])
else if (strcmp (argv[i], "-x") == 0) else if (strcmp (argv[i], "-x") == 0)
MDTestSuite (); MDTestSuite ();
else MDFile (argv[i]); else MDFile (argv[i]);
return 0;
} }
/* /*

3
menu/menu_hash.h
View File

@ -286,6 +286,9 @@ extern "C" {
#define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU
#define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U
#define MENU_LABEL_CONTENT_COLLECTION_LIST 0x0f8a9086U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x0f8a9086U
#define MENU_LABEL_OSK_ENABLE 0x8e208498U
#define MENU_LABEL_AUDIO_MUTE 0xe0ca1151U
#define MENU_LABEL_EXIT_EMULATOR 0x86d5d467U
#ifdef __cplusplus #ifdef __cplusplus
} }

37
menu/menu_setting.c
View File

@ -2863,6 +2863,26 @@ static int setting_get_description_compare_label(uint32_t label_hash,
"The modulation stops when the button \n" "The modulation stops when the button \n"
"itself (not turbo button) is released."); "itself (not turbo button) is released.");
break; break;
case MENU_LABEL_OSK_ENABLE:
snprintf(s, len,
" -- Enable/disable on-screen keyboard.");
break;
case MENU_LABEL_AUDIO_MUTE:
snprintf(s, len,
" -- Mute/unmute audio.");
break;
case MENU_LABEL_EXIT_EMULATOR:
snprintf(s, len,
" -- Key to exit RetroArch cleanly."
#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
"\nKilling it in any hard way (SIGKILL, \n"
"etc) will terminate without saving\n"
"RAM, etc. On Unix-likes,\n"
"SIGINT/SIGTERM allows\n"
"a clean deinitialization."
#endif
);
break;
default: default:
return -1; return -1;
} }
@ -2905,17 +2925,6 @@ int setting_get_description(const char *label, char *s,
" \n" " \n"
"Positive X axis is right. \n" "Positive X axis is right. \n"
"Positive Y axis is down."); "Positive Y axis is down.");
else if (!strcmp(label, "exit_emulator"))
snprintf(s, len,
" -- Key to exit RetroArch cleanly."
#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
"\nKilling it in any hard way (SIGKILL, \n"
"etc) will terminate without saving\n"
"RAM, etc. On Unix-likes,\n"
"SIGINT/SIGTERM allows\n"
"a clean deinitialization."
#endif
);
else if (!strcmp(label, "rewind")) else if (!strcmp(label, "rewind"))
snprintf(s, len, snprintf(s, len,
" -- Hold button down to rewind.\n" " -- Hold button down to rewind.\n"
@ -2964,12 +2973,6 @@ int setting_get_description(const char *label, char *s,
else if (!strcmp(label, "shader_prev")) else if (!strcmp(label, "shader_prev"))
snprintf(s, len, snprintf(s, len,
" -- Applies previous shader in directory."); " -- Applies previous shader in directory.");
else if (!strcmp(label, "audio_mute"))
snprintf(s, len,
" -- Mute/unmute audio.");
else if (!strcmp(label, "osk_enable"))
snprintf(s, len,
" -- Enable/disable on-screen keyboard.");
else else
snprintf(s, len, snprintf(s, len,
"-- No info on this item is available. --\n"); "-- No info on this item is available. --\n");