From f64280ff00bbf131b82322cb2fe138b259ebc5c3 Mon Sep 17 00:00:00 2001 From: Kevin Ferrare Date: Sun, 2 Jul 2006 16:18:59 +0000 Subject: OOPS Forgot remote keys bindings for the ID3 info screen git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10176 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/list.c | 4 ++-- apps/screens.c | 19 ++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/apps/gui/list.c b/apps/gui/list.c index 5dff8dc1b2..67c0f3055d 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -658,7 +658,7 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, unsigned button) #endif gui_synclist_scroll_right(lists); gui_synclist_draw(lists); - return true; + return LIST_PGRIGHT; #endif #ifdef LIST_PGLEFT @@ -670,7 +670,7 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, unsigned button) #endif gui_synclist_scroll_left(lists); gui_synclist_draw(lists); - return true; + return LIST_PGLEFT; #endif /* for pgup / pgdown, we are obliged to have a different behaviour depending on the screen diff --git a/apps/screens.c b/apps/screens.c index 99f23c55af..c54333109b 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -1017,7 +1017,6 @@ char * id3_get_info(int selected_item, void* data, char *buffer) { struct mp3entry* id3 =(struct mp3entry*)data; int info_no=selected_item/2; - DEBUGF("%d : %d\n",info_no, selected_item); if(!(selected_item%2)) {/* header */ int headers[]= @@ -1125,22 +1124,8 @@ bool browse_id3(void) gui_synclist_draw(&id3_lists); while (true) { key = button_get_w_tmo(HZ/2); - /* If moved, "say" the entry under the cursor */ - gui_synclist_do_button(&id3_lists, key); - switch( key ) { -#ifdef SETTINGS_OK2 - case SETTINGS_OK2: -#endif - case SETTINGS_CANCEL: - lcd_stop_scroll(); - /* Eat release event */ - button_get(true); - return(false); - - default: - if (default_event_handler(key) == SYS_USB_CONNECTED) - return true; - } + if(key!=BUTTON_NONE && !(key&BUTTON_REL) && !gui_synclist_do_button(&id3_lists, key)) + return(default_event_handler(key) == SYS_USB_CONNECTED); gui_syncstatusbar_draw(&statusbars, false); } } -- cgit v1.2.3