RoLo now works on the iRiver

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6238 a1c6a512-1295-4272-9138-f99709370657

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 @@
 #include "rolo.h"
 #include "sprintf.h"
 
+#ifndef SIMULATOR
 static int boot_size = 0;
 static int boot_cluster;
+#endif
 extern bool boot_changed;
 
 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)
         if ( !(dptr->attr & ATTR_DIRECTORY) && (len > 4) )
            dptr->attr |= filetype_get_attr(entry->d_name);
 
+#ifndef SIMULATOR
         /* memorize/compare details about the boot file */
         if ((c->currdir[1] == 0) && !strcasecmp(entry->d_name, BOOTFILE)) {
             if (boot_size) {
@@ -251,7 +254,8 @@ int ft_load(struct tree_context* c, const char* tempdir)
             boot_size = entry->size;
             boot_cluster = entry->startcluster;
         }
-
+#endif
+        
         /* filter out non-visible files */
         if (!(dptr->attr & ATTR_DIRECTORY) && (
             (*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[] = {
 #endif
     { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK },
 #ifndef SIMULATOR
-#ifdef HAVE_LCD_BITMAP
-    { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ },
-#else
-    { ".mod", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ },
-#endif
+    { BOOTFILE_EXT, TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ },
 #endif /* #ifndef SIMULATOR */
 };
 
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 @@
 
 #endif
 
-#ifdef HAVE_LCD_BITMAP
-#define BOOTFILE "ajbrec.ajz"
-#else
-#define BOOTFILE "archos.mod"
-#endif
-
 struct entry {
     short attr; /* FAT attributes + file type flags */
     unsigned long time_write; /* Last write time */