Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/apps/features.txt b/apps/features.txt
- index 44ef3dd..48de014 100644
- --- a/apps/features.txt
- +++ b/apps/features.txt
- @@ -154,10 +154,6 @@ rtc
- serial_port
- #endif
- -#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
- -soft_shutdown
- -#endif
- -
- #if defined(HAVE_SPDIF_POWER)
- spdif_power
- #endif
- diff --git a/apps/lang/english.lang b/apps/lang/english.lang
- index 5ee087e..cd7d736 100644
- --- a/apps/lang/english.lang
- +++ b/apps/lang/english.lang
- @@ -6617,16 +6617,13 @@
- desc: in main menu
- user: core
- <source>
- - *: none
- - soft_shutdown: "Shut down"
- + *: "Shut down"
- </source>
- <dest>
- - *: none
- - soft_shutdown: "Shut down"
- + *: "Shut down"
- </dest>
- <voice>
- - *: none
- - soft_shutdown: "Shut down"
- + *: "Shut down"
- </voice>
- </phrase>
- <phrase>
- diff --git a/apps/root_menu.c b/apps/root_menu.c
- index 472c1db..2ef2631 100644
- --- a/apps/root_menu.c
- +++ b/apps/root_menu.c
- @@ -461,7 +461,6 @@ MENUITEM_RETURNVALUE(playlists, ID2P(LANG_CATALOG), GO_TO_PLAYLISTS_SCREEN,
- MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
- NULL, Icon_System_menu);
- -#if CONFIG_KEYPAD == PLAYER_PAD
- static int do_shutdown(void)
- {
- #if CONFIG_CHARGING
- @@ -474,7 +473,7 @@ static int do_shutdown(void)
- }
- MENUITEM_FUNCTION(do_shutdown_item, 0, ID2P(LANG_SHUTDOWN),
- do_shutdown, NULL, NULL, Icon_NOICON);
- -#endif
- +
- MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
- item_callback, Icon_Rockbox,
- &bookmarks, &file_browser,
- @@ -488,11 +487,7 @@ MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
- #if CONFIG_TUNER
- &fm,
- #endif
- - &playlists, &rocks_browser, &system_menu_
- -
- -#if CONFIG_KEYPAD == PLAYER_PAD
- - ,&do_shutdown_item
- -#endif
- + &playlists, &rocks_browser, &system_menu_, &do_shutdown_item
- );
- static int item_callback(int action, const struct menu_item_ex *this_item)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement