diff options
-rw-r--r-- | apps/filetypes.c | 2 | ||||
-rw-r--r-- | apps/filetypes.h | 2 | ||||
-rw-r--r-- | apps/gui/icon.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index 481c0df6de..779337e0ca 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -159,7 +159,7 @@ void tree_get_filetypes(const struct filetype** types, int* count) | |||
159 | #define ROCK_EXTENSION "rock" | 159 | #define ROCK_EXTENSION "rock" |
160 | 160 | ||
161 | struct file_type { | 161 | struct file_type { |
162 | int icon; /* the icon which shall be used for it, NOICON if unknown */ | 162 | enum themable_icons icon; /* the icon which shall be used for it, NOICON if unknown */ |
163 | unsigned char attr; /* FILE_ATTR_MASK >> 8 */ | 163 | unsigned char attr; /* FILE_ATTR_MASK >> 8 */ |
164 | char* plugin; /* Which plugin to use, NULL if unknown, or builtin */ | 164 | char* plugin; /* Which plugin to use, NULL if unknown, or builtin */ |
165 | char* extension; /* NULL for none */ | 165 | char* extension; /* NULL for none */ |
diff --git a/apps/filetypes.h b/apps/filetypes.h index a957f1631f..0b50b45580 100644 --- a/apps/filetypes.h +++ b/apps/filetypes.h | |||
@@ -51,8 +51,8 @@ | |||
51 | struct filetype { | 51 | struct filetype { |
52 | char* extension; | 52 | char* extension; |
53 | int tree_attr; | 53 | int tree_attr; |
54 | int icon; | ||
55 | int voiceclip; | 54 | int voiceclip; |
55 | enum themable_icons icon; | ||
56 | }; | 56 | }; |
57 | void tree_get_filetypes(const struct filetype**, int*); | 57 | void tree_get_filetypes(const struct filetype**, int*); |
58 | 58 | ||
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 9a58076509..e79defe798 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -30,12 +30,11 @@ typedef const unsigned char * ICON; | |||
30 | typedef long ICON; | 30 | typedef long ICON; |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #define NOICON Icon_NOICON | ||
34 | #define FORCE_INBUILT_ICON 0x80000000 | ||
35 | /* Don't #ifdef icon values, or we wont be able to use the same | 33 | /* Don't #ifdef icon values, or we wont be able to use the same |
36 | bmp for every target. */ | 34 | bmp for every target. */ |
37 | enum themable_icons { | 35 | enum themable_icons { |
38 | Icon_NOICON = -1, /* Dont put this in a .bmp */ | 36 | NOICON = -1, |
37 | Icon_NOICON = NOICON, /* Dont put this in a .bmp */ | ||
39 | Icon_Audio, | 38 | Icon_Audio, |
40 | Icon_Folder, | 39 | Icon_Folder, |
41 | Icon_Playlist, | 40 | Icon_Playlist, |