mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2660 from duduke/master

Browse Source 
Reboot Menu Item
This commit is contained in:
Twinaphex 2016-01-22 14:39:21 +01:00
commit 4dd08e6382
6 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command_event.c
View File

@ -1320,6 +1320,13 @@ bool event_command(enum event_command cmd)
runloop_msg_queue_push("Shutting down...", 1, 180, true);
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
system("shutdown -P now");
#endif
break;
case EVENT_CMD_REBOOT:
#if defined(__linux__) && !defined(ANDROID)
runloop_msg_queue_push("Rebooting...", 1, 180, true);
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
system("shutdown -r now");
#endif
break;
case EVENT_CMD_RESUME:

2
command_event.h
View File

@ -120,6 +120,8 @@ enum event_command
EVENT_CMD_QUIT_RETROARCH,
/* Shutdown the OS */
EVENT_CMD_SHUTDOWN,
/* Reboot the OS */
EVENT_CMD_REBOOT,
/* Resume RetroArch when in menu. */
EVENT_CMD_RESUME,
/* Toggles pause. */

2
menu/drivers/xmb.c
View File

@ -2605,6 +2605,8 @@ static int xmb_list_push(void *data, void *userdata, menu_displaylist_info_t *in
#endif
menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_SHUTDOWN), PARSE_ACTION, false);
menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_REBOOT), PARSE_ACTION, false);
info->need_push = true;
ret = 0;
break;

10
menu/intl/menu_hash_us.c
View File

@ -574,6 +574,12 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "settings";
case MENU_LABEL_QUIT_RETROARCH:
return "quit_retroarch";
#if defined(HAVE_LAKKA)
case MENU_LABEL_SHUTDOWN:
return "shutdown";
case MENU_LABEL_REBOOT:
return "reboot";
#endif
case MENU_LABEL_HELP:
return "help";
case MENU_LABEL_SAVE_NEW_CONFIG:
@ -1248,8 +1254,12 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Settings";
case MENU_LABEL_VALUE_QUIT_RETROARCH:
return "Quit RetroArch";
#if defined(HAVE_LAKKA)
case MENU_LABEL_VALUE_SHUTDOWN:
return "Shutdown";
case MENU_LABEL_VALUE_REBOOT:
return "Reboot";
#endif
case MENU_LABEL_VALUE_HELP:
return "help";
case MENU_LABEL_VALUE_SAVE_NEW_CONFIG:

8
menu/menu_hash.h
View File

@ -690,8 +690,12 @@ extern "C" {
#define MENU_LABEL_VALUE_CLOSE_CONTENT 0x2b3d9556U
#define MENU_LABEL_QUIT_RETROARCH 0x84b0bc71U
#define MENU_LABEL_VALUE_QUIT_RETROARCH 0x8e7024f2U
#define MENU_LABEL_SHUTDOWN 0xfc460361U
#define MENU_LABEL_VALUE_SHUTDOWN 0x740b6741U
#if defined(HAVE_LAKKA)
#define MENU_LABEL_SHUTDOWN 0xfc460361U
#define MENU_LABEL_VALUE_SHUTDOWN 0x740b6741U
#define MENU_LABEL_REBOOT 0x19266b70U
#define MENU_LABEL_VALUE_REBOOT 0xce815750U
#endif
#define MENU_LABEL_DEFERRED_VIDEO_FILTER 0x966ad201U
#define MENU_LABEL_DEFERRED_CORE_LIST_SET 0xa6d5fdb4U
#define MENU_LABEL_VALUE_STARTING_DOWNLOAD 0x42e10f03U

11
menu/menu_setting.c
View File

@ -3413,6 +3413,17 @@ static bool setting_append_list_main_menu_options(
menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_SHUTDOWN);
#endif
#if defined(HAVE_LAKKA)
CONFIG_ACTION(
list, list_info,
menu_hash_to_str(MENU_LABEL_REBOOT),
menu_hash_to_str(MENU_LABEL_VALUE_REBOOT),
&group_info,
&subgroup_info,
parent_group);
menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_REBOOT);
#endif
CONFIG_ACTION(
list, list_info,
menu_hash_to_str(MENU_LABEL_INPUT_SETTINGS),