len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use enum themable_icons in struct file_type and struct filetype (who made those names?).

Browse source 
It's the correct type and should save some memory due to struct padding (on eabi).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30027 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-06-20 19:32:48 +00:00
parent 26ec41b028
commit 7b374b43b5
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/filetypes.c
View file

@ -159,7 +159,7 @@ void tree_get_filetypes(const struct filetype** types, int* count)
#define ROCK_EXTENSION "rock" #define ROCK_EXTENSION "rock"
struct file_type { struct file_type {
int icon; /* the icon which shall be used for it, NOICON if unknown */ enum themable_icons icon; /* the icon which shall be used for it, NOICON if unknown */
unsigned char attr; /* FILE_ATTR_MASK >> 8 */ unsigned char attr; /* FILE_ATTR_MASK >> 8 */
char* plugin; /* Which plugin to use, NULL if unknown, or builtin */ char* plugin; /* Which plugin to use, NULL if unknown, or builtin */
char* extension; /* NULL for none */ char* extension; /* NULL for none */

2
apps/filetypes.h
View file

@ -51,8 +51,8 @@
struct filetype { struct filetype {
char* extension; char* extension;
int tree_attr; int tree_attr;
int icon;
int voiceclip; int voiceclip;
enum themable_icons icon;
}; };
void tree_get_filetypes(const struct filetype**, int*); void tree_get_filetypes(const struct filetype**, int*);

5
apps/gui/icon.h
View file

@ -30,12 +30,11 @@ typedef const unsigned char * ICON;
typedef long ICON; typedef long ICON;
#endif #endif
#define NOICON Icon_NOICON
#define FORCE_INBUILT_ICON 0x80000000
/* Don't #ifdef icon values, or we wont be able to use the same /* Don't #ifdef icon values, or we wont be able to use the same
bmp for every target. */ bmp for every target. */
enum themable_icons { enum themable_icons {
Icon_NOICON = -1, /* Dont put this in a .bmp */ NOICON = -1,
Icon_NOICON = NOICON, /* Dont put this in a .bmp */
Icon_Audio, Icon_Audio,
Icon_Folder, Icon_Folder,
Icon_Playlist, Icon_Playlist,