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

Let's try to implement the message inside intl/msg_hash_us.c instead - 

we need to get index from somewhere
This commit is contained in:
twinaphex 2017-08-16 05:45:51 +02:00
parent 442339a63e
commit 0eb78a26b3
3 changed files with 185 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
intl/msg_hash_us.c
View File

@ -25,189 +25,200 @@
#include "../configuration.h" #include "../configuration.h"
#include "../verbosity.h" #include "../verbosity.h"
int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
{
uint32_t driver_hash = 0; uint32_t driver_hash = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM)
{
snprintf(s, len,
"TODO/FIXME - Fill in message here."
);
return 0;
}
if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN) { msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN; {
unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
switch (idx) { switch (idx)
case RARCH_FAST_FORWARD_KEY: {
snprintf(s, len, case RARCH_FAST_FORWARD_KEY:
"Toggles between fast-forwarding and \n" snprintf(s, len,
"normal speed." "Toggles between fast-forwarding and \n"
); "normal speed."
break; );
case RARCH_FAST_FORWARD_HOLD_KEY: break;
snprintf(s, len, case RARCH_FAST_FORWARD_HOLD_KEY:
"Hold for fast-forward. \n" snprintf(s, len,
" \n" "Hold for fast-forward. \n"
"Releasing button disables fast-forward." " \n"
); "Releasing button disables fast-forward."
break; );
case RARCH_PAUSE_TOGGLE: break;
snprintf(s, len, case RARCH_PAUSE_TOGGLE:
"Toggle between paused and non-paused state."); snprintf(s, len,
break; "Toggle between paused and non-paused state.");
case RARCH_FRAMEADVANCE: break;
snprintf(s, len, case RARCH_FRAMEADVANCE:
"Frame advance when content is paused."); snprintf(s, len,
break; "Frame advance when content is paused.");
case RARCH_SHADER_NEXT: break;
snprintf(s, len, case RARCH_SHADER_NEXT:
"Applies next shader in directory."); snprintf(s, len,
break; "Applies next shader in directory.");
case RARCH_SHADER_PREV: break;
snprintf(s, len, case RARCH_SHADER_PREV:
"Applies previous shader in directory."); snprintf(s, len,
break; "Applies previous shader in directory.");
case RARCH_CHEAT_INDEX_PLUS: break;
case RARCH_CHEAT_INDEX_MINUS: case RARCH_CHEAT_INDEX_PLUS:
case RARCH_CHEAT_TOGGLE: case RARCH_CHEAT_INDEX_MINUS:
snprintf(s, len, case RARCH_CHEAT_TOGGLE:
"Cheats."); snprintf(s, len,
break; "Cheats.");
case RARCH_RESET: break;
snprintf(s, len, case RARCH_RESET:
"Reset the content."); snprintf(s, len,
break; "Reset the content.");
case RARCH_SCREENSHOT: break;
snprintf(s, len, case RARCH_SCREENSHOT:
"Take screenshot."); snprintf(s, len,
break; "Take screenshot.");
case RARCH_MUTE: break;
snprintf(s, len, case RARCH_MUTE:
"Mute/unmute audio."); snprintf(s, len,
break; "Mute/unmute audio.");
case RARCH_OSK: break;
snprintf(s, len, case RARCH_OSK:
"Toggles onscreen keyboard."); snprintf(s, len,
break; "Toggles onscreen keyboard.");
case RARCH_NETPLAY_FLIP: break;
snprintf(s, len, case RARCH_NETPLAY_FLIP:
"Netplay flip users."); snprintf(s, len,
break; "Netplay flip users.");
case RARCH_NETPLAY_GAME_WATCH: break;
snprintf(s, len, case RARCH_NETPLAY_GAME_WATCH:
"Netplay toggle play/spectate mode."); snprintf(s, len,
break; "Netplay toggle play/spectate mode.");
case RARCH_SLOWMOTION: break;
snprintf(s, len, case RARCH_SLOWMOTION:
"Hold for slowmotion."); snprintf(s, len,
break; "Hold for slowmotion.");
case RARCH_ENABLE_HOTKEY: break;
snprintf(s, len, case RARCH_ENABLE_HOTKEY:
"Enable other hotkeys. \n" snprintf(s, len,
" \n" "Enable other hotkeys. \n"
"If this hotkey is bound to either\n" " \n"
"a keyboard, joybutton or joyaxis, \n" "If this hotkey is bound to either\n"
"all other hotkeys will be enabled only \n" "a keyboard, joybutton or joyaxis, \n"
"if this one is held at the same time. \n" "all other hotkeys will be enabled only \n"
" \n" "if this one is held at the same time. \n"
"Alternatively, all hotkeys for keyboard \n" " \n"
"could be disabled by the user."); "Alternatively, all hotkeys for keyboard \n"
break; "could be disabled by the user.");
case RARCH_VOLUME_UP: break;
snprintf(s, len, case RARCH_VOLUME_UP:
"Increases audio volume."); snprintf(s, len,
break; "Increases audio volume.");
case RARCH_VOLUME_DOWN: break;
snprintf(s, len, case RARCH_VOLUME_DOWN:
"Decreases audio volume."); snprintf(s, len,
break; "Decreases audio volume.");
case RARCH_OVERLAY_NEXT: break;
snprintf(s, len, case RARCH_OVERLAY_NEXT:
"Switches to next overlay. Wraps around."); snprintf(s, len,
break; "Switches to next overlay. Wraps around.");
case RARCH_DISK_EJECT_TOGGLE: break;
snprintf(s, len, case RARCH_DISK_EJECT_TOGGLE:
"Toggles eject for disks. \n" snprintf(s, len,
" \n" "Toggles eject for disks. \n"
"Used for multiple-disk content. "); " \n"
break; "Used for multiple-disk content. ");
case RARCH_DISK_NEXT: break;
case RARCH_DISK_PREV: case RARCH_DISK_NEXT:
snprintf(s, len, case RARCH_DISK_PREV:
"Cycles through disk images. Use after ejecting. \n" snprintf(s, len,
" \n" "Cycles through disk images. Use after ejecting. \n"
"Complete by toggling eject again."); " \n"
break; "Complete by toggling eject again.");
case RARCH_GRAB_MOUSE_TOGGLE: break;
snprintf(s, len, case RARCH_GRAB_MOUSE_TOGGLE:
"Toggles mouse grab. \n" snprintf(s, len,
" \n" "Toggles mouse grab. \n"
"When mouse is grabbed, RetroArch hides the \n" " \n"
"mouse, and keeps the mouse pointer inside \n" "When mouse is grabbed, RetroArch hides the \n"
"the window to allow relative mouse input to \n" "mouse, and keeps the mouse pointer inside \n"
"work better."); "the window to allow relative mouse input to \n"
break; "work better.");
case RARCH_GAME_FOCUS_TOGGLE: break;
snprintf(s, len, case RARCH_GAME_FOCUS_TOGGLE:
"Toggles game focus.\n" snprintf(s, len,
" \n" "Toggles game focus.\n"
"When a game has focus, RetroArch will both disable \n" " \n"
"hotkeys and keep/warp the mouse pointer inside the window."); "When a game has focus, RetroArch will both disable \n"
break; "hotkeys and keep/warp the mouse pointer inside the window.");
case RARCH_MENU_TOGGLE: break;
snprintf(s, len, "Toggles menu."); case RARCH_MENU_TOGGLE:
break; snprintf(s, len, "Toggles menu.");
case RARCH_LOAD_STATE_KEY: break;
snprintf(s, len, case RARCH_LOAD_STATE_KEY:
"Loads state."); snprintf(s, len,
break; "Loads state.");
case RARCH_FULLSCREEN_TOGGLE_KEY: break;
snprintf(s, len, case RARCH_FULLSCREEN_TOGGLE_KEY:
"Toggles fullscreen."); snprintf(s, len,
break; "Toggles fullscreen.");
case RARCH_QUIT_KEY: break;
snprintf(s, len, case RARCH_QUIT_KEY:
"Key to exit RetroArch cleanly. \n" snprintf(s, len,
" \n" "Key to exit RetroArch cleanly. \n"
"Killing it in any hard way (SIGKILL, etc.) will \n" " \n"
"terminate RetroArch without saving RAM, etc." "Killing it in any hard way (SIGKILL, etc.) will \n"
"terminate RetroArch without saving RAM, etc."
#ifdef __unix__ #ifdef __unix__
"\nOn Unix-likes, SIGINT/SIGTERM allows a clean \n" "\nOn Unix-likes, SIGINT/SIGTERM allows a clean \n"
"deinitialization." "deinitialization."
#endif #endif
""); "");
break; break;
case RARCH_STATE_SLOT_PLUS: case RARCH_STATE_SLOT_PLUS:
case RARCH_STATE_SLOT_MINUS: case RARCH_STATE_SLOT_MINUS:
snprintf(s, len, snprintf(s, len,
"State slots. \n" "State slots. \n"
" \n" " \n"
"With slot set to 0, save state name is \n" "With slot set to 0, save state name is \n"
"*.state (or whatever defined on commandline). \n" "*.state (or whatever defined on commandline). \n"
" \n" " \n"
"When slot is not 0, path will be <path><d>, \n" "When slot is not 0, path will be <path><d>, \n"
"where <d> is slot number."); "where <d> is slot number.");
break; break;
case RARCH_SAVE_STATE_KEY: case RARCH_SAVE_STATE_KEY:
snprintf(s, len, snprintf(s, len,
"Saves state."); "Saves state.");
break; break;
case RARCH_REWIND: case RARCH_REWIND:
snprintf(s, len, snprintf(s, len,
"Hold button down to rewind. \n" "Hold button down to rewind. \n"
" \n" " \n"
"Rewinding must be enabled."); "Rewinding must be enabled.");
break; break;
case RARCH_MOVIE_RECORD_TOGGLE: case RARCH_MOVIE_RECORD_TOGGLE:
snprintf(s, len, snprintf(s, len,
"Toggle between recording and not."); "Toggle between recording and not.");
break; break;
default: default:
if (string_is_empty(s)) if (string_is_empty(s))
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len);
break; break;
} }
return 0; return 0;
} }
switch (msg) { switch (msg)
{
case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS: case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS:
snprintf(s, len, "Login details for your \n" snprintf(s, len, "Login details for your \n"
"Retro Achievements account. \n" "Retro Achievements account. \n"

22
menu/cbs/menu_cbs_info.c
View File

@ -70,20 +70,6 @@ static int action_info_cheevos(unsigned type, const char *label)
} }
#endif #endif
#ifdef HAVE_NETWORKING
static int action_info_room(unsigned type, const char *label)
{
unsigned new_id = type - MENU_SETTINGS_NETPLAY_ROOMS_START;
#if 1
RARCH_LOG ("Room id: %u IP: %s Port: %u\n", new_id,
netplay_room_list[new_id].address, netplay_room_list[new_id].port);
#endif
/* add description here
the relevant data is in netplay_room_list[new_id]*/
return 0;
}
#endif
int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx) const char *path, const char *label, unsigned type, size_t idx)
{ {
@ -99,14 +85,6 @@ int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
} }
#endif #endif
#ifdef HAVE_NETWORKING
if ((type >= MENU_SETTINGS_NETPLAY_ROOMS_START))
{
BIND_ACTION_INFO(cbs, action_info_room);
return 0;
}
#endif
BIND_ACTION_INFO(cbs, action_info_default); BIND_ACTION_INFO(cbs, action_info_default);
return -1; return -1;

1
menu/cbs/menu_cbs_ok.c
View File

@ -3413,6 +3413,7 @@ static int action_ok_push_scan_file(const char *path,
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
struct netplay_host_list *lan_hosts; struct netplay_host_list *lan_hosts;
int lan_room_count; int lan_room_count;
void netplay_refresh_rooms_menu(file_list_t *list) void netplay_refresh_rooms_menu(file_list_t *list)
{ {
char s[4115]; char s[4115];