diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-02-23 13:12:08 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-02-23 13:12:08 +0000 |
| commit | bc357da2ae5dada31a45517ffde8549fb47ce7cf (patch) | |
| tree | ccad88c5afa34225748b83d4addab0157df32d6d | |
| parent | 01bf4d35ac5992797c0584bb934d13a4b15773dc (diff) | |
Small fixes for icon behaviour on the Player: Read viewer icon numbers from viewers.config, and correct the icon selection in icons.c. Now viewer supported filetypes get the mirrored question mark icon instead of no icon at all.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16389 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/filetypes.c | 4 | ||||
| -rw-r--r-- | apps/player/icons.c | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index db463d7ff4..8427bc7450 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c @@ -325,7 +325,6 @@ static void read_config(char* config_file) filetypes[filetype_count].icon = Icon_Questionmark; heighest_attr++; /* get the icon */ -#ifdef HAVE_LCD_BITMAP s = e+1; if (*s == '*') filetypes[filetype_count].icon = atoi(s+1); @@ -333,9 +332,6 @@ static void read_config(char* config_file) filetypes[filetype_count].icon = Icon_NOICON; else if (*s >= '0' && *s <= '9') filetypes[filetype_count].icon = Icon_Last_Themeable + atoi(s); -#else - filetypes[filetype_count].icon = Icon_NOICON; -#endif filetype_count++; } } diff --git a/apps/player/icons.c b/apps/player/icons.c index 6717eb12bd..7460a8fcf2 100644 --- a/apps/player/icons.c +++ b/apps/player/icons.c @@ -38,9 +38,8 @@ enum old_values{ old_Icon_Config, }; -static const long icon_unknown = old_Icon_Unknown; -static const long icons[Icon_Last_Themeable] = { - [0 ... Icon_Last_Themeable-1] = 0, +static const unsigned short icons[Icon_Last_Themeable] = { + [0 ... Icon_Last_Themeable-1] = ' ', [Icon_Audio] = old_Icon_Audio, [Icon_Folder] = old_Icon_Folder, @@ -52,8 +51,8 @@ static const long icons[Icon_Last_Themeable] = { [Icon_Config] = old_Icon_Config, [Icon_Plugin] = old_Icon_Plugin, [Icon_Bookmark] = old_Icon_Bookmark, - [Icon_Queued] = 'Q', - [Icon_Moving] = 'M', + [Icon_Queued] = old_Icon_Queued, + [Icon_Moving] = old_Icon_Moving, /* [Icon_Keyboard] = , @@ -83,10 +82,10 @@ static const long icons[Icon_Last_Themeable] = { extern void screen_put_iconxy(struct screen * screen, int x, int y, enum themable_icons icon) { - if (icon == -1) - screen->putc(x, y, icon_unknown); - else if ((icon==Icon_NOICON) && (icons[icon]!=0)) + if (icon == Icon_NOICON) screen->putc(x, y, ' '); + else if (icon >= Icon_Last_Themeable) + screen->putc(x, y, old_Icon_Unknown); else screen->putc(x, y, icons[icon]); } |