diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2023-04-15 20:28:18 +0200 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2023-05-26 13:08:12 -0400 |
commit | 31b8cd8f73afd22f6cde718a0bc52ed7ce5639d6 (patch) | |
tree | 30c98d300afe4b29e1aa95523af5c479055b5938 /apps | |
parent | 6e192dc28d6bddcc405dc66f0ca5174d265f66af (diff) | |
download | rockbox-31b8cd8f73afd22f6cde718a0bc52ed7ce5639d6.tar.gz rockbox-31b8cd8f73afd22f6cde718a0bc52ed7ce5639d6.zip |
PictureFlow: Remove menu items for "Return" and "Clear Playlist"
On all players, it should be possible to return from the Main Menu
by pressing the Back or Menu key. Unless I'm missing something...
"Clear Playlist" has hopefully become superfluous after the "Playing Next"
context menu was added, which offers similar functionality.
Change-Id: I741544978fb7936b8d5a34dfc656472e20c1737e
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 8 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 12 |
2 files changed, 4 insertions, 16 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 49a953f995..695de3b232 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -15110,16 +15110,16 @@ | |||
15110 | </phrase> | 15110 | </phrase> |
15111 | <phrase> | 15111 | <phrase> |
15112 | id: LANG_CLEAR_PLAYLIST | 15112 | id: LANG_CLEAR_PLAYLIST |
15113 | desc: in the pictureflow main menu | 15113 | desc: deprecated |
15114 | user: core | 15114 | user: core |
15115 | <source> | 15115 | <source> |
15116 | *: "Clear playlist" | 15116 | *: "" |
15117 | </source> | 15117 | </source> |
15118 | <dest> | 15118 | <dest> |
15119 | *: "Clear playlist" | 15119 | *: "" |
15120 | </dest> | 15120 | </dest> |
15121 | <voice> | 15121 | <voice> |
15122 | *: "Clear playlist" | 15122 | *: "" |
15123 | </voice> | 15123 | </voice> |
15124 | </phrase> | 15124 | </phrase> |
15125 | <phrase> | 15125 | <phrase> |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 9896ca45bf..75504cf17e 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -3657,11 +3657,9 @@ enum { | |||
3657 | PF_GOTO_LAST_ALBUM, | 3657 | PF_GOTO_LAST_ALBUM, |
3658 | PF_GOTO_WPS, | 3658 | PF_GOTO_WPS, |
3659 | #if PF_PLAYBACK_CAPABLE | 3659 | #if PF_PLAYBACK_CAPABLE |
3660 | PF_MENU_CLEAR_PLAYLIST, | ||
3661 | PF_MENU_PLAYBACK_CONTROL, | 3660 | PF_MENU_PLAYBACK_CONTROL, |
3662 | #endif | 3661 | #endif |
3663 | PF_MENU_SETTINGS, | 3662 | PF_MENU_SETTINGS, |
3664 | PF_MENU_RETURN, | ||
3665 | PF_MENU_QUIT, | 3663 | PF_MENU_QUIT, |
3666 | }; | 3664 | }; |
3667 | 3665 | ||
@@ -3679,11 +3677,9 @@ static int main_menu(void) | |||
3679 | ID2P(LANG_GOTO_LAST_ALBUM), | 3677 | ID2P(LANG_GOTO_LAST_ALBUM), |
3680 | ID2P(LANG_GOTO_WPS), | 3678 | ID2P(LANG_GOTO_WPS), |
3681 | #if PF_PLAYBACK_CAPABLE | 3679 | #if PF_PLAYBACK_CAPABLE |
3682 | ID2P(LANG_CLEAR_PLAYLIST), | ||
3683 | ID2P(LANG_PLAYBACK_CONTROL), | 3680 | ID2P(LANG_PLAYBACK_CONTROL), |
3684 | #endif | 3681 | #endif |
3685 | ID2P(LANG_SETTINGS), | 3682 | ID2P(LANG_SETTINGS), |
3686 | ID2P(LANG_RETURN), | ||
3687 | ID2P(LANG_MENU_QUIT)); | 3683 | ID2P(LANG_MENU_QUIT)); |
3688 | while (1) { | 3684 | while (1) { |
3689 | switch (rb->do_menu(&main_menu,&selection, NULL, false)) { | 3685 | switch (rb->do_menu(&main_menu,&selection, NULL, false)) { |
@@ -3718,12 +3714,6 @@ static int main_menu(void) | |||
3718 | case PF_GOTO_WPS: /* WPS */ | 3714 | case PF_GOTO_WPS: /* WPS */ |
3719 | return -2; | 3715 | return -2; |
3720 | #if PF_PLAYBACK_CAPABLE | 3716 | #if PF_PLAYBACK_CAPABLE |
3721 | case PF_MENU_CLEAR_PLAYLIST: | ||
3722 | if(rb->warn_on_pl_erase() && rb->playlist_remove_all_tracks(NULL) == 0) { | ||
3723 | rb->playlist_create(NULL, NULL); | ||
3724 | rb->splash(HZ*2, ID2P(LANG_PLAYLIST_CLEARED)); | ||
3725 | } | ||
3726 | break; | ||
3727 | case PF_MENU_PLAYBACK_CONTROL: /* Playback Control */ | 3717 | case PF_MENU_PLAYBACK_CONTROL: /* Playback Control */ |
3728 | playback_control(NULL); | 3718 | playback_control(NULL); |
3729 | break; | 3719 | break; |
@@ -3732,8 +3722,6 @@ static int main_menu(void) | |||
3732 | result = settings_menu(); | 3722 | result = settings_menu(); |
3733 | if ( result != 0 ) return result; | 3723 | if ( result != 0 ) return result; |
3734 | break; | 3724 | break; |
3735 | case PF_MENU_RETURN: | ||
3736 | return 0; | ||
3737 | case PF_MENU_QUIT: | 3725 | case PF_MENU_QUIT: |
3738 | return -1; | 3726 | return -1; |
3739 | 3727 | ||