diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-05-04 10:58:05 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-05-04 10:58:05 +0000 |
commit | daa8341a13ddc93981d2c2178b183a13b5e08950 (patch) | |
tree | 3a4946cb4b66d0e475aa04bdd8fafc5bd4a5b3e5 /apps/tree.c | |
parent | 977ad4b5a185cede164cfab9b52ba808bd7ed560 (diff) | |
download | rockbox-daa8341a13ddc93981d2c2178b183a13b5e08950.tar.gz rockbox-daa8341a13ddc93981d2c2178b183a13b5e08950.zip |
a bit of code cleanup.. use a single function to get the statusbar height (or lack of if its enabled), and remove some gui_textarea stuff which could be done using the splash. (gui_textarea is on the way out)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17350 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 56 |
1 files changed, 5 insertions, 51 deletions
diff --git a/apps/tree.c b/apps/tree.c index afe76a3dc8..a5741dfc31 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -936,8 +936,6 @@ static bool add_dir(char* dirname, int len, int fd) | |||
936 | for (i=0; i < filetypes_count; i++) { | 936 | for (i=0; i < filetypes_count; i++) { |
937 | if (filetypes[i].tree_attr == FILE_ATTR_AUDIO) { | 937 | if (filetypes[i].tree_attr == FILE_ATTR_AUDIO) { |
938 | if (!strcasecmp(cp, filetypes[i].extension)) { | 938 | if (!strcasecmp(cp, filetypes[i].extension)) { |
939 | char buf[8]; | ||
940 | int i; | ||
941 | write(fd, dirname, strlen(dirname)); | 939 | write(fd, dirname, strlen(dirname)); |
942 | write(fd, "/", 1); | 940 | write(fd, "/", 1); |
943 | write(fd, entry->d_name, x); | 941 | write(fd, entry->d_name, x); |
@@ -946,28 +944,8 @@ static bool add_dir(char* dirname, int len, int fd) | |||
946 | plsize++; | 944 | plsize++; |
947 | if(TIME_AFTER(current_tick, pltick+HZ/4)) { | 945 | if(TIME_AFTER(current_tick, pltick+HZ/4)) { |
948 | pltick = current_tick; | 946 | pltick = current_tick; |
949 | 947 | gui_syncsplash(0, "%d %s", | |
950 | snprintf(buf, sizeof buf, "%d", plsize); | 948 | plsize, str(LANG_DIR_BROWSER)); |
951 | #ifdef HAVE_LCD_BITMAP | ||
952 | FOR_NB_SCREENS(i) | ||
953 | { | ||
954 | screens[i].puts(0, 4, (unsigned char *)buf); | ||
955 | gui_textarea_update(&screens[i]); | ||
956 | } | ||
957 | #else | ||
958 | if (plsize > 999) | ||
959 | x=7; | ||
960 | else if (plsize > 99) | ||
961 | x=8; | ||
962 | else if (plsize > 9) | ||
963 | x=9; | ||
964 | else | ||
965 | x = 10; | ||
966 | |||
967 | FOR_NB_SCREENS(i) { | ||
968 | screens[i].puts(x,0,buf); | ||
969 | } | ||
970 | #endif | ||
971 | } | 949 | } |
972 | break; | 950 | break; |
973 | } | 951 | } |
@@ -984,22 +962,14 @@ static bool add_dir(char* dirname, int len, int fd) | |||
984 | bool create_playlist(void) | 962 | bool create_playlist(void) |
985 | { | 963 | { |
986 | int fd; | 964 | int fd; |
987 | int i; | ||
988 | char filename[MAX_PATH]; | 965 | char filename[MAX_PATH]; |
989 | 966 | ||
990 | pltick = current_tick; | 967 | pltick = current_tick; |
991 | 968 | ||
992 | snprintf(filename, sizeof filename, "%s.m3u8", | 969 | snprintf(filename, sizeof filename, "%s.m3u8", |
993 | tc.currdir[1] ? tc.currdir : "/root"); | 970 | tc.currdir[1] ? tc.currdir : "/root"); |
994 | FOR_NB_SCREENS(i) | 971 | gui_syncsplash(0, "%s %s", str(LANG_CREATING), filename); |
995 | { | 972 | |
996 | gui_textarea_clear(&screens[i]); | ||
997 | screens[i].puts(0, 0, str(LANG_CREATING)); | ||
998 | screens[i].puts_scroll(0, 1, (unsigned char *)filename); | ||
999 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) | ||
1000 | gui_textarea_update(&screens[i]); | ||
1001 | #endif | ||
1002 | } | ||
1003 | fd = creat(filename); | 973 | fd = creat(filename); |
1004 | if (fd < 0) | 974 | if (fd < 0) |
1005 | return false; | 975 | return false; |
@@ -1272,25 +1242,9 @@ void tree_restore(void) | |||
1272 | if (global_settings.dircache) | 1242 | if (global_settings.dircache) |
1273 | { | 1243 | { |
1274 | /* Print "Scanning disk..." to the display. */ | 1244 | /* Print "Scanning disk..." to the display. */ |
1275 | int i; | 1245 | gui_syncsplash(0, str(LANG_SCANNING_DISK)); |
1276 | FOR_NB_SCREENS(i) | ||
1277 | { | ||
1278 | screens[i].putsxy((LCD_WIDTH/2) - | ||
1279 | ((strlen(str(LANG_SCANNING_DISK)) * | ||
1280 | screens[i].char_width)/2), | ||
1281 | LCD_HEIGHT-screens[i].char_height*3, | ||
1282 | str(LANG_SCANNING_DISK)); | ||
1283 | gui_textarea_update(&screens[i]); | ||
1284 | } | ||
1285 | cond_talk_ids_fq(LANG_SCANNING_DISK); | ||
1286 | 1246 | ||
1287 | dircache_build(global_status.dircache_size); | 1247 | dircache_build(global_status.dircache_size); |
1288 | |||
1289 | /* Clean the text when we are done. */ | ||
1290 | FOR_NB_SCREENS(i) | ||
1291 | { | ||
1292 | gui_textarea_clear(&screens[i]); | ||
1293 | } | ||
1294 | } | 1248 | } |
1295 | #endif | 1249 | #endif |
1296 | #ifdef HAVE_TAGCACHE | 1250 | #ifdef HAVE_TAGCACHE |