diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.c | 6 | ||||
-rw-r--r-- | apps/tree.c | 6 | ||||
-rw-r--r-- | apps/tree.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index c828f176ba..a3754ea190 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -39,8 +39,10 @@ | |||
39 | #include "rolo.h" | 39 | #include "rolo.h" |
40 | #include "sprintf.h" | 40 | #include "sprintf.h" |
41 | 41 | ||
42 | #ifndef SIMULATOR | ||
42 | static int boot_size = 0; | 43 | static int boot_size = 0; |
43 | static int boot_cluster; | 44 | static int boot_cluster; |
45 | #endif | ||
44 | extern bool boot_changed; | 46 | extern bool boot_changed; |
45 | 47 | ||
46 | int ft_build_playlist(struct tree_context* c, int start_index) | 48 | int ft_build_playlist(struct tree_context* c, int start_index) |
@@ -241,6 +243,7 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
241 | if ( !(dptr->attr & ATTR_DIRECTORY) && (len > 4) ) | 243 | if ( !(dptr->attr & ATTR_DIRECTORY) && (len > 4) ) |
242 | dptr->attr |= filetype_get_attr(entry->d_name); | 244 | dptr->attr |= filetype_get_attr(entry->d_name); |
243 | 245 | ||
246 | #ifndef SIMULATOR | ||
244 | /* memorize/compare details about the boot file */ | 247 | /* memorize/compare details about the boot file */ |
245 | if ((c->currdir[1] == 0) && !strcasecmp(entry->d_name, BOOTFILE)) { | 248 | if ((c->currdir[1] == 0) && !strcasecmp(entry->d_name, BOOTFILE)) { |
246 | if (boot_size) { | 249 | if (boot_size) { |
@@ -251,7 +254,8 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
251 | boot_size = entry->size; | 254 | boot_size = entry->size; |
252 | boot_cluster = entry->startcluster; | 255 | boot_cluster = entry->startcluster; |
253 | } | 256 | } |
254 | 257 | #endif | |
258 | |||
255 | /* filter out non-visible files */ | 259 | /* filter out non-visible files */ |
256 | if (!(dptr->attr & ATTR_DIRECTORY) && ( | 260 | if (!(dptr->attr & ATTR_DIRECTORY) && ( |
257 | (*c->dirfilter == SHOW_PLAYLIST && | 261 | (*c->dirfilter == SHOW_PLAYLIST && |
diff --git a/apps/tree.c b/apps/tree.c index b7ad02a4aa..69bc8bc244 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -81,11 +81,7 @@ const struct filetype filetypes[] = { | |||
81 | #endif | 81 | #endif |
82 | { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK }, | 82 | { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK }, |
83 | #ifndef SIMULATOR | 83 | #ifndef SIMULATOR |
84 | #ifdef HAVE_LCD_BITMAP | 84 | { BOOTFILE_EXT, TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, |
85 | { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, | ||
86 | #else | ||
87 | { ".mod", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, | ||
88 | #endif | ||
89 | #endif /* #ifndef SIMULATOR */ | 85 | #endif /* #ifndef SIMULATOR */ |
90 | }; | 86 | }; |
91 | 87 | ||
diff --git a/apps/tree.h b/apps/tree.h index 239d0042f7..c3ab60c243 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -113,12 +113,6 @@ | |||
113 | 113 | ||
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #ifdef HAVE_LCD_BITMAP | ||
117 | #define BOOTFILE "ajbrec.ajz" | ||
118 | #else | ||
119 | #define BOOTFILE "archos.mod" | ||
120 | #endif | ||
121 | |||
122 | struct entry { | 116 | struct entry { |
123 | short attr; /* FAT attributes + file type flags */ | 117 | short attr; /* FAT attributes + file type flags */ |
124 | unsigned long time_write; /* Last write time */ | 118 | unsigned long time_write; /* Last write time */ |