diff options
author | Justin Heiner <jheiner@rockbox.org> | 2002-08-30 02:08:36 +0000 |
---|---|---|
committer | Justin Heiner <jheiner@rockbox.org> | 2002-08-30 02:08:36 +0000 |
commit | 0492d624b00bc077978bdb4cd680526bbe026446 (patch) | |
tree | 66b073ef66a5eb38e9720827b805aa07934e6be9 | |
parent | 7e11b62d19ab547512a0eea438bd5cba3f943e3e (diff) | |
download | rockbox-0492d624b00bc077978bdb4cd680526bbe026446.tar.gz rockbox-0492d624b00bc077978bdb4cd680526bbe026446.zip |
Another update to Zagor's commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2070 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/wps.c | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/apps/wps.c b/apps/wps.c index 1cb1c98c8d..8ec965e395 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -154,7 +154,7 @@ static void draw_screen(void) | |||
154 | for(tmpcnt=2;tmpcnt<=5;tmpcnt++) | 154 | for(tmpcnt=2;tmpcnt<=5;tmpcnt++) |
155 | wps_display[tmpcnt][0] = 0; | 155 | wps_display[tmpcnt][0] = 0; |
156 | scroll_line = 0; | 156 | scroll_line = 0; |
157 | refresh_wps(true); | 157 | refresh_wps(false); |
158 | #else | 158 | #else |
159 | lcd_puts_scroll(0, 1, (++szDelimit)); | 159 | lcd_puts_scroll(0, 1, (++szDelimit)); |
160 | #endif | 160 | #endif |
@@ -170,7 +170,7 @@ static void draw_screen(void) | |||
170 | "%pc/%pt"); | 170 | "%pc/%pt"); |
171 | #endif | 171 | #endif |
172 | scroll_line = 0; | 172 | scroll_line = 0; |
173 | refresh_wps(true); | 173 | refresh_wps(false); |
174 | #else | 174 | #else |
175 | char buffer[64]; | 175 | char buffer[64]; |
176 | char ch = '/'; | 176 | char ch = '/'; |
@@ -225,7 +225,7 @@ static void draw_screen(void) | |||
225 | "%fb kbit %ffHz"); | 225 | "%fb kbit %ffHz"); |
226 | } | 226 | } |
227 | scroll_line = 0; | 227 | scroll_line = 0; |
228 | refresh_wps(true); | 228 | refresh_wps(false); |
229 | #else | 229 | #else |
230 | char buffer[64]; | 230 | char buffer[64]; |
231 | 231 | ||
@@ -262,7 +262,7 @@ static void draw_screen(void) | |||
262 | snprintf(wps_display[0],sizeof(wps_display[0]),"%s","%ia"); | 262 | snprintf(wps_display[0],sizeof(wps_display[0]),"%s","%ia"); |
263 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s","%it"); | 263 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s","%it"); |
264 | scroll_line = 1; | 264 | scroll_line = 1; |
265 | refresh_wps(true); | 265 | refresh_wps(false); |
266 | #else | 266 | #else |
267 | lcd_puts(0, 0, id3->artist?id3->artist:"<no artist>"); | 267 | lcd_puts(0, 0, id3->artist?id3->artist:"<no artist>"); |
268 | lcd_puts_scroll(0, 1, id3->title?id3->title:"<no title>"); | 268 | lcd_puts_scroll(0, 1, id3->title?id3->title:"<no title>"); |
@@ -279,7 +279,7 @@ static void draw_screen(void) | |||
279 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s", | 279 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s", |
280 | "%pc/%pt"); | 280 | "%pc/%pt"); |
281 | scroll_line = 0; | 281 | scroll_line = 0; |
282 | refresh_wps(true); | 282 | refresh_wps(false); |
283 | #else | 283 | #else |
284 | char buffer[64]; | 284 | char buffer[64]; |
285 | char ch = '/'; | 285 | char ch = '/'; |
@@ -309,7 +309,7 @@ static void draw_screen(void) | |||
309 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s", | 309 | snprintf(wps_display[1],sizeof(wps_display[1]),"%s", |
310 | "%pc/%pt"); | 310 | "%pc/%pt"); |
311 | } | 311 | } |
312 | refresh_wps(true); | 312 | refresh_wps(false); |
313 | break; | 313 | break; |
314 | } | 314 | } |
315 | #endif | 315 | #endif |
@@ -354,10 +354,9 @@ bool refresh_wps(bool refresh_scroll) | |||
354 | else | 354 | else |
355 | { | 355 | { |
356 | if(scroll_line != l) | 356 | if(scroll_line != l) |
357 | display_custom_wps(0, l, false, wps_display[l]); | 357 | display_custom_wps(0, l, false, wps_display[l]); |
358 | else | 358 | if(scroll_line == l && refresh_scroll) |
359 | if(refresh_scroll) | 359 | display_custom_wps(0, l, true, wps_display[l]); |
360 | display_custom_wps(0, l, true, wps_display[l]); | ||
361 | } | 360 | } |
362 | } | 361 | } |
363 | #ifdef HAVE_LCD_BITMAP | 362 | #ifdef HAVE_LCD_BITMAP |
@@ -1031,6 +1030,9 @@ static void update(void) | |||
1031 | lcd_stop_scroll(); | 1030 | lcd_stop_scroll(); |
1032 | id3 = mpeg_current_track(); | 1031 | id3 = mpeg_current_track(); |
1033 | draw_screen(); | 1032 | draw_screen(); |
1033 | #ifdef CUSTOM_WPS | ||
1034 | refresh_wps(true); | ||
1035 | #endif | ||
1034 | } | 1036 | } |
1035 | 1037 | ||
1036 | if (id3) { | 1038 | if (id3) { |
@@ -1066,6 +1068,9 @@ static bool keylock(void) | |||
1066 | #endif | 1068 | #endif |
1067 | display_keylock_text(true); | 1069 | display_keylock_text(true); |
1068 | keys_locked = true; | 1070 | keys_locked = true; |
1071 | #ifdef CUSTOM_WPS | ||
1072 | refresh_wps(true); | ||
1073 | #endif | ||
1069 | draw_screen(); | 1074 | draw_screen(); |
1070 | status_draw(); | 1075 | status_draw(); |
1071 | while (button_get(false)); /* clear button queue */ | 1076 | while (button_get(false)); /* clear button queue */ |
@@ -1106,6 +1111,9 @@ static bool keylock(void) | |||
1106 | default: | 1111 | default: |
1107 | display_keylock_text(true); | 1112 | display_keylock_text(true); |
1108 | while (button_get(false)); /* clear button queue */ | 1113 | while (button_get(false)); /* clear button queue */ |
1114 | #ifdef CUSTOM_WPS | ||
1115 | refresh_wps(true); | ||
1116 | #endif | ||
1109 | draw_screen(); | 1117 | draw_screen(); |
1110 | break; | 1118 | break; |
1111 | } | 1119 | } |
@@ -1144,17 +1152,17 @@ static bool menu(void) | |||
1144 | 1152 | ||
1145 | /* mute */ | 1153 | /* mute */ |
1146 | #ifdef HAVE_PLAYER_KEYPAD | 1154 | #ifdef HAVE_PLAYER_KEYPAD |
1147 | case BUTTON_PLAY: | 1155 | case BUTTON_MENU | BUTTON_PLAY: |
1148 | #else | 1156 | #else |
1149 | case BUTTON_UP: | 1157 | case BUTTON_MENU | BUTTON_UP: |
1150 | #endif | 1158 | #endif |
1151 | if ( muted ) | 1159 | if ( muted ) |
1152 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 1160 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
1153 | else | 1161 | else |
1154 | mpeg_sound_set(SOUND_VOLUME, 0); | 1162 | mpeg_sound_set(SOUND_VOLUME, 0); |
1155 | muted = !muted; | 1163 | muted = !muted; |
1164 | lcd_icon(ICON_PARAM, false); | ||
1156 | display_mute_text(muted); | 1165 | display_mute_text(muted); |
1157 | exit = true; | ||
1158 | break; | 1166 | break; |
1159 | 1167 | ||
1160 | /* key lock */ | 1168 | /* key lock */ |
@@ -1221,7 +1229,9 @@ static bool menu(void) | |||
1221 | #endif | 1229 | #endif |
1222 | 1230 | ||
1223 | draw_screen(); | 1231 | draw_screen(); |
1224 | 1232 | #ifdef CUSTOM_WPS | |
1233 | refresh_wps(true); | ||
1234 | #endif | ||
1225 | return false; | 1235 | return false; |
1226 | } | 1236 | } |
1227 | 1237 | ||
@@ -1259,7 +1269,7 @@ int wps_show(void) | |||
1259 | if (id3) { | 1269 | if (id3) { |
1260 | draw_screen(); | 1270 | draw_screen(); |
1261 | #ifdef CUSTOM_WPS | 1271 | #ifdef CUSTOM_WPS |
1262 | refresh_wps(false); | 1272 | refresh_wps(true); |
1263 | #else | 1273 | #else |
1264 | display_file_time(); | 1274 | display_file_time(); |
1265 | #endif | 1275 | #endif |