From 49a73ca90f1ceacbf096ddc0064d21c38c56955d Mon Sep 17 00:00:00 2001 From: Stéphane Doyon Date: Sun, 4 May 2008 02:57:30 +0000 Subject: Revert r17345 on jdgordon's request, until we figure out why it crashes my x5. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17346 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/quickscreen.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'apps/gui/quickscreen.c') diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 36f3d82217..c62ad24717 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c @@ -35,7 +35,6 @@ #include "viewport.h" #include "audio.h" #include "quickscreen.h" -#include "talk.h" static struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT]; static struct viewport vp_icons[NB_SCREENS]; @@ -221,15 +220,7 @@ static void gui_quickscreen_draw(struct gui_quickscreen *qs, display->set_viewport(NULL); } -static int option_value(const struct settings_list *setting) -{ - if ((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING) - { - return *(bool*)setting->setting==true?1:0; - } - else - return *(int*)setting->setting; -} + /* * Does the actions associated to the given button if any * - qs : the quickscreen @@ -258,8 +249,6 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button) return false; } option_select_next_val((struct settings_list *)qs->items[item], false, true); - option_talk_value((struct settings_list *)qs->items[item], - option_value((struct settings_list *)qs->items[item]), false); return true; } @@ -282,17 +271,6 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter) quickscreen_fix_viewports(qs, &screens[i], &vp[i]); gui_quickscreen_draw(qs, &screens[i], &vp[i]); } - talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false); - option_talk_value(qs->items[QUICKSCREEN_LEFT], - option_value(qs->items[QUICKSCREEN_LEFT]), true); - - talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true); - option_talk_value(qs->items[QUICKSCREEN_RIGHT], - option_value(qs->items[QUICKSCREEN_RIGHT]), true); - - talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true); - option_talk_value(qs->items[QUICKSCREEN_BOTTOM], - option_value(qs->items[QUICKSCREEN_BOTTOM]), true); while (true) { button = get_action(CONTEXT_QUICKSCREEN,HZ/5); if(default_event_handler(button) == SYS_USB_CONNECTED) -- cgit v1.2.3