devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Revert r17345 on jdgordon's request, until we figure out why it crashes my x5.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17346 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stéphane Doyon 2008-05-04 02:57:30 +00:00
parent dd4e3848b8
commit 49a73ca90f
3 changed files with 15 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/gui/quickscreen.c
View file

@ -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)