diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-10-07 22:59:06 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-10-07 22:59:06 +0000 |
commit | b779fcc3ed9adbaf0fda5598f3e26a154f1c1410 (patch) | |
tree | d1e8969d93b1933ecf478aab908298b804878405 /apps | |
parent | 1195b2384f50263e9da019342a3b109afc390193 (diff) | |
download | rockbox-b779fcc3ed9adbaf0fda5598f3e26a154f1c1410.tar.gz rockbox-b779fcc3ed9adbaf0fda5598f3e26a154f1c1410.zip |
Fix exit/return behavior in the id3 info screen.Fixes returning immediately on touchscreen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30727 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/onplay.c | 12 | ||||
-rw-r--r-- | apps/screens.c | 9 |
2 files changed, 16 insertions, 5 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 03981c6310..e51cac478c 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -978,9 +978,17 @@ static int view_cue_item_callback(int action, | |||
978 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), | 978 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), |
979 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); | 979 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); |
980 | 980 | ||
981 | |||
982 | static int browse_id3_wrapper(void) | ||
983 | { | ||
984 | if (browse_id3()) | ||
985 | return GO_TO_ROOT; | ||
986 | return GO_TO_PREVIOUS; | ||
987 | } | ||
988 | |||
981 | /* CONTEXT_WPS items */ | 989 | /* CONTEXT_WPS items */ |
982 | MENUITEM_FUNCTION(browse_id3_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO), | 990 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), |
983 | browse_id3, NULL, NULL, Icon_NOICON); | 991 | browse_id3_wrapper, NULL, NULL, Icon_NOICON); |
984 | #ifdef HAVE_PITCHSCREEN | 992 | #ifdef HAVE_PITCHSCREEN |
985 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), | 993 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), |
986 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); | 994 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); |
diff --git a/apps/screens.c b/apps/screens.c index e20f96731c..e49133f8db 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -774,10 +774,13 @@ bool browse_id3(void) | |||
774 | gui_synclist_draw(&id3_lists); | 774 | gui_synclist_draw(&id3_lists); |
775 | while (true) { | 775 | while (true) { |
776 | key = get_action(CONTEXT_LIST,HZ/2); | 776 | key = get_action(CONTEXT_LIST,HZ/2); |
777 | if(key!=ACTION_NONE && key!=ACTION_UNKNOWN | 777 | if(!gui_synclist_do_button(&id3_lists, &key,LIST_WRAP_UNLESS_HELD)) |
778 | && !gui_synclist_do_button(&id3_lists, &key,LIST_WRAP_UNLESS_HELD)) | ||
779 | { | 778 | { |
780 | return(default_event_handler(key) == SYS_USB_CONNECTED); | 779 | if (key == ACTION_STD_OK || key == ACTION_STD_CANCEL) |
780 | return false; | ||
781 | else if (key == ACTION_STD_MENU || | ||
782 | default_event_handler(key) == SYS_USB_CONNECTED) | ||
783 | return true; | ||
781 | } | 784 | } |
782 | } | 785 | } |
783 | } | 786 | } |