summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-10-09 14:40:15 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-10-09 14:40:15 +0000
commitd8a2165f78dd3a73254cd837d6abba1cfe87efcc (patch)
treea6aa6246e789a1e80c88d3077119015248a5fa54 /apps/plugins
parent8055825312a111b6c41503e72d3b08cecb95aa28 (diff)
downloadrockbox-d8a2165f78dd3a73254cd837d6abba1cfe87efcc.tar.gz
rockbox-d8a2165f78dd3a73254cd837d6abba1cfe87efcc.zip
Quick fix for the edit screen in the random_folder_advance_config plugin, no more blank screen and it now shows the correct directory count
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11161 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/SOURCES4
-rw-r--r--apps/plugins/random_folder_advance_config.c17
2 files changed, 14 insertions, 7 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index b0e5f70e0a..eb372c96b9 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -22,6 +22,10 @@ stopwatch.c
22vbrfix.c 22vbrfix.c
23viewer.c 23viewer.c
24 24
25#ifdef CPU_COLDFIRE
26sampr_test.c
27#endif
28
25#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR) 29#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR)
26wavplay.c 30wavplay.c
27#endif 31#endif
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c
index 46d6eea381..c8553358a3 100644
--- a/apps/plugins/random_folder_advance_config.c
+++ b/apps/plugins/random_folder_advance_config.c
@@ -54,7 +54,7 @@ struct file_format *list = NULL;
54 54
55#endif 55#endif
56 56
57void update_screen(void) 57void update_screen(bool clear)
58{ 58{
59 char buf[15]; 59 char buf[15];
60#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */ 60#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */
@@ -62,13 +62,15 @@ void update_screen(void)
62 FOR_NB_SCREENS(i) 62 FOR_NB_SCREENS(i)
63 { 63 {
64 rb->snprintf(buf,15,"Folders: %d",dirs_count); 64 rb->snprintf(buf,15,"Folders: %d",dirs_count);
65 rb->screens[i]->clear_display(); 65 if(clear)
66 rb->screens[i]->clear_display();
66 rb->screens[i]->putsxy(0,0,buf); 67 rb->screens[i]->putsxy(0,0,buf);
67 rb->screens[i]->update(); 68 rb->screens[i]->update();
68 } 69 }
69#else 70#else
70 rb->snprintf(buf,15,"Folders: %d",dirs_count); 71 rb->snprintf(buf,15,"Folders: %d",dirs_count);
71 rb->lcd_clear_display(); 72 if(clear)
73 rb->lcd_clear_display();
72 rb->lcd_puts(0,0,buf); 74 rb->lcd_puts(0,0,buf);
73#endif 75#endif
74} 76}
@@ -111,7 +113,7 @@ void traversedir(char* location, char* name)
111 } 113 }
112 } 114 }
113 if (*rb->current_tick - lasttick > (HZ/2)) { 115 if (*rb->current_tick - lasttick > (HZ/2)) {
114 update_screen(); 116 update_screen(false);
115 lasttick = *rb->current_tick; 117 lasttick = *rb->current_tick;
116 if (rb->action_userabort(TIMEOUT_NOBLOCK)) 118 if (rb->action_userabort(TIMEOUT_NOBLOCK))
117 { 119 {
@@ -137,7 +139,7 @@ void generate(void)
137 return; 139 return;
138 } 140 }
139#ifndef HAVE_LCD_CHARCELLS 141#ifndef HAVE_LCD_CHARCELLS
140 update_screen(); 142 update_screen(true);
141#endif 143#endif
142 lasttick = *rb->current_tick; 144 lasttick = *rb->current_tick;
143 145
@@ -168,6 +170,7 @@ void edit_list(void)
168 rb->read(fd,buffer,buffer_size); 170 rb->read(fd,buffer,buffer_size);
169 rb->close(fd); 171 rb->close(fd);
170 list = (struct file_format *)buffer; 172 list = (struct file_format *)buffer;
173 dirs_count = list->count;
171 174
172 rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1); 175 rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1);
173 rb->gui_synclist_set_icon_callback(&lists,NULL); 176 rb->gui_synclist_set_icon_callback(&lists,NULL);
@@ -177,10 +180,10 @@ void edit_list(void)
177 180
178 while (!exit) 181 while (!exit)
179 { 182 {
180 rb->gui_synclist_draw(&lists);
181#ifndef HAVE_LCD_CHARCELLS 183#ifndef HAVE_LCD_CHARCELLS
182 update_screen(); 184 update_screen(true);
183#endif 185#endif
186 rb->gui_synclist_draw(&lists);
184 button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); 187 button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK);
185 if (rb->gui_synclist_do_button(&lists,button)) 188 if (rb->gui_synclist_do_button(&lists,button))
186 continue; 189 continue;