diff options
Diffstat (limited to 'apps/player/icons.c')
-rw-r--r-- | apps/player/icons.c | 15 |
1 files changed, 7 insertions, 8 deletions
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{ | |||
38 | old_Icon_Config, | 38 | old_Icon_Config, |
39 | }; | 39 | }; |
40 | 40 | ||
41 | static const long icon_unknown = old_Icon_Unknown; | 41 | static const unsigned short icons[Icon_Last_Themeable] = { |
42 | static const long icons[Icon_Last_Themeable] = { | 42 | [0 ... Icon_Last_Themeable-1] = ' ', |
43 | [0 ... Icon_Last_Themeable-1] = 0, | ||
44 | 43 | ||
45 | [Icon_Audio] = old_Icon_Audio, | 44 | [Icon_Audio] = old_Icon_Audio, |
46 | [Icon_Folder] = old_Icon_Folder, | 45 | [Icon_Folder] = old_Icon_Folder, |
@@ -52,8 +51,8 @@ static const long icons[Icon_Last_Themeable] = { | |||
52 | [Icon_Config] = old_Icon_Config, | 51 | [Icon_Config] = old_Icon_Config, |
53 | [Icon_Plugin] = old_Icon_Plugin, | 52 | [Icon_Plugin] = old_Icon_Plugin, |
54 | [Icon_Bookmark] = old_Icon_Bookmark, | 53 | [Icon_Bookmark] = old_Icon_Bookmark, |
55 | [Icon_Queued] = 'Q', | 54 | [Icon_Queued] = old_Icon_Queued, |
56 | [Icon_Moving] = 'M', | 55 | [Icon_Moving] = old_Icon_Moving, |
57 | 56 | ||
58 | /* | 57 | /* |
59 | [Icon_Keyboard] = , | 58 | [Icon_Keyboard] = , |
@@ -83,10 +82,10 @@ static const long icons[Icon_Last_Themeable] = { | |||
83 | extern void screen_put_iconxy(struct screen * screen, | 82 | extern void screen_put_iconxy(struct screen * screen, |
84 | int x, int y, enum themable_icons icon) | 83 | int x, int y, enum themable_icons icon) |
85 | { | 84 | { |
86 | if (icon == -1) | 85 | if (icon == Icon_NOICON) |
87 | screen->putc(x, y, icon_unknown); | ||
88 | else if ((icon==Icon_NOICON) && (icons[icon]!=0)) | ||
89 | screen->putc(x, y, ' '); | 86 | screen->putc(x, y, ' '); |
87 | else if (icon >= Icon_Last_Themeable) | ||
88 | screen->putc(x, y, old_Icon_Unknown); | ||
90 | else | 89 | else |
91 | screen->putc(x, y, icons[icon]); | 90 | screen->putc(x, y, icons[icon]); |
92 | } | 91 | } |