last of the errors... hopefully
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29537 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
e765906d5b
commit
8f3feda719
2 changed files with 7 additions and 1 deletions
|
@ -125,7 +125,7 @@ void *skin_find_item(const char *label, enum skin_find_what what,
|
|||
union {
|
||||
struct skin_token_list *linkedlist;
|
||||
struct skin_element *vplist;
|
||||
} list;
|
||||
} list = {NULL};
|
||||
bool isvplist = false;
|
||||
void *ret = NULL;
|
||||
switch (what)
|
||||
|
@ -135,9 +135,11 @@ void *skin_find_item(const char *label, enum skin_find_what what,
|
|||
list.vplist = data->tree;
|
||||
isvplist = true;
|
||||
break;
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
case SKIN_FIND_IMAGE:
|
||||
list.linkedlist = data->images;
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
case SKIN_FIND_TOUCHREGION:
|
||||
list.linkedlist = data->touchregions;
|
||||
|
@ -157,10 +159,12 @@ void *skin_find_item(const char *label, enum skin_find_what what,
|
|||
skip = !(((struct skin_viewport *)ret)->is_infovp ==
|
||||
(what==SKIN_FIND_UIVP));
|
||||
break;
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
case SKIN_FIND_IMAGE:
|
||||
ret = list.linkedlist->token->value.data;
|
||||
itemlabel = ((struct gui_img *)ret)->label;
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
case SKIN_FIND_TOUCHREGION:
|
||||
ret = list.linkedlist->token->value.data;
|
||||
|
|
|
@ -367,7 +367,9 @@ const char *get_radio_token(struct wps_token *token, int preset_offset,
|
|||
enum skin_find_what {
|
||||
SKIN_FIND_VP = 0,
|
||||
SKIN_FIND_UIVP,
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
SKIN_FIND_IMAGE,
|
||||
#endif
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
SKIN_FIND_TOUCHREGION,
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue