diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-05-12 13:41:12 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-05-12 13:41:12 +0000 |
commit | 2a3aab675ae29e02b0d594d88de74634ad78820c (patch) | |
tree | 098f00f34dcd110ce09a50788affc04485dbbe50 | |
parent | 9b50389083887c92b7a74910c8e889823caa8f46 (diff) | |
download | rockbox-2a3aab675ae29e02b0d594d88de74634ad78820c.tar.gz rockbox-2a3aab675ae29e02b0d594d88de74634ad78820c.zip |
preparation for the JPEG viewer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4610 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/icons.c | 1 | ||||
-rw-r--r-- | apps/recorder/icons.h | 2 | ||||
-rw-r--r-- | apps/tree.c | 6 | ||||
-rw-r--r-- | apps/tree.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 88aa943202..1612fc10af 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -69,6 +69,7 @@ unsigned char bitmap_icons_6x8[LastIcon][6] = | |||
69 | { 0x70, 0x70, 0x7f, 0x7f, 0x70, 0x70 }, /* Chip8 game: joystick */ | 69 | { 0x70, 0x70, 0x7f, 0x7f, 0x70, 0x70 }, /* Chip8 game: joystick */ |
70 | { 0x5d, 0x7f, 0x5d, 0x7f, 0x5d, 0x7f }, /* Video file: film strip */ | 70 | { 0x5d, 0x7f, 0x5d, 0x7f, 0x5d, 0x7f }, /* Video file: film strip */ |
71 | { 0xff, 0x81, 0xaf, 0xaa, 0x8c, 0xf8 }, /* Bookmark file */ | 71 | { 0xff, 0x81, 0xaf, 0xaa, 0x8c, 0xf8 }, /* Bookmark file */ |
72 | { 0x18, 0x24, 0x3c, 0x3c, 0x24, 0x18 }, /* JPEG: eye */ | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | unsigned char bitmap_icons_7x8[][7] = | 75 | unsigned char bitmap_icons_7x8[][7] = |
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index d362e05fee..30f0cc1f58 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -30,7 +30,7 @@ enum icons_6x8 { | |||
30 | Selected, Cursor, Wps, Mod_Ajz, | 30 | Selected, Cursor, Wps, Mod_Ajz, |
31 | Font, Language, Text, Config, | 31 | Font, Language, Text, Config, |
32 | Plugin, Flashfile, Chip8, Video, | 32 | Plugin, Flashfile, Chip8, Video, |
33 | Bookmark, | 33 | Bookmark, Jpeg, |
34 | LastIcon | 34 | LastIcon |
35 | }; | 35 | }; |
36 | 36 | ||
diff --git a/apps/tree.c b/apps/tree.c index 47447fc85b..140b226a01 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -99,6 +99,7 @@ static struct | |||
99 | #ifdef HAVE_LCD_BITMAP | 99 | #ifdef HAVE_LCD_BITMAP |
100 | { ".ucl", TREE_ATTR_UCL, Flashfile, VOICE_EXT_UCL }, | 100 | { ".ucl", TREE_ATTR_UCL, Flashfile, VOICE_EXT_UCL }, |
101 | { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, | 101 | { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, |
102 | { ".jpg", TREE_ATTR_JPEG, Jpeg, -1 }, | ||
102 | #else | 103 | #else |
103 | { ".mod", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, | 104 | { ".mod", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, |
104 | #endif | 105 | #endif |
@@ -1198,6 +1199,11 @@ static bool dirbrowse(char *root, int *dirfilter) | |||
1198 | plugin_load("/.rockbox/rocks/video.rock",buf); | 1199 | plugin_load("/.rockbox/rocks/video.rock",buf); |
1199 | break; | 1200 | break; |
1200 | 1201 | ||
1202 | /* JPEG image */ | ||
1203 | case TREE_ATTR_JPEG: | ||
1204 | plugin_load("/.rockbox/rocks/jpeg.rock",buf); | ||
1205 | break; | ||
1206 | |||
1201 | case TREE_ATTR_FONT: | 1207 | case TREE_ATTR_FONT: |
1202 | font_load(buf); | 1208 | font_load(buf); |
1203 | set_file(buf, global_settings.font_file, | 1209 | set_file(buf, global_settings.font_file, |
diff --git a/apps/tree.h b/apps/tree.h index c7b678eb82..2bd133d3e9 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -40,6 +40,7 @@ struct entry { | |||
40 | #define TREE_ATTR_CH8 0x0B00 /* chip-8 game */ | 40 | #define TREE_ATTR_CH8 0x0B00 /* chip-8 game */ |
41 | #define TREE_ATTR_RVF 0x0C00 /* rockbox video file */ | 41 | #define TREE_ATTR_RVF 0x0C00 /* rockbox video file */ |
42 | #define TREE_ATTR_BMARK 0x0D00 /* book mark file */ | 42 | #define TREE_ATTR_BMARK 0x0D00 /* book mark file */ |
43 | #define TREE_ATTR_JPEG 0x0E00 /* JPEG image */ | ||
43 | #define TREE_ATTR_MASK 0xFFC0 /* which bits tree.c uses (above) */ | 44 | #define TREE_ATTR_MASK 0xFFC0 /* which bits tree.c uses (above) */ |
44 | 45 | ||
45 | void tree_init(void); | 46 | void tree_init(void); |