Update of /cvsroot/rockbox/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv20723
Modified Files:
menu.c screens.c settings.c sleeptimer.c sound_menu.c status.c
status.h tree.c wps-display.c wps.c
Log Message:
Only redraw the status line when info actually changed.
Index: menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/menu.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- menu.c 16 Apr 2003 00:12:29 -0000 1.57
+++ menu.c 23 Apr 2003 11:26:21 -0000 1.58
@@ -167,7 +167,7 @@
LCD_HEIGHT - SCROLLBAR_Y, menus[m].itemcount, menus[m].top,
menus[m].top + menu_lines, VERTICAL);
#endif
- status_draw();
+ status_draw(true);
lcd_update();
}
@@ -332,7 +332,7 @@
return MENU_ATTACHED_USB;
}
- status_draw();
+ status_draw(false);
}
return MENU_SELECTED_EXIT;
}
Index: screens.c
===================================================================
RCS file: /cvsroot/rockbox/apps/screens.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- screens.c 3 Apr 2003 00:18:14 -0000 1.23
+++ screens.c 23 Apr 2003 11:26:21 -0000 1.24
@@ -85,14 +85,14 @@
BMPWIDTH_usb_logo, 8, false);
lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*3, 6, 40,
BMPWIDTH_usb_logo, 8, false);
- status_draw();
+ status_draw(true);
lcd_update();
#else
lcd_puts(0, 0, "[USB Mode]");
status_set_param(false);
status_set_audio(false);
status_set_usb(true);
- status_draw();
+ status_draw(false);
#endif
}
@@ -101,9 +101,10 @@
#ifndef SIMULATOR
backlight_on();
usb_acknowledge(SYS_USB_CONNECTED_ACK);
+ usb_display_info();
while(usb_wait_for_disconnect_w_tmo(&button_queue, HZ)) {
if(usb_inserted()) {
- usb_display_info();
+ status_draw(false);
}
}
#ifdef HAVE_LCD_CHARCELLS
Index: settings.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- settings.c 23 Apr 2003 09:17:32 -0000 1.134
+++ settings.c 23 Apr 2003 11:26:21 -0000 1.135
@@ -1609,7 +1609,7 @@
snprintf(str,sizeof str,"%d %s ", *variable, unit);
lcd_puts(0, 1, str);
#ifdef HAVE_LCD_BITMAP
- status_draw();
+ status_draw(true);
#endif
lcd_update();
@@ -1699,7 +1699,7 @@
while ( !done ) {
lcd_puts(0, 1, options[*variable]);
#ifdef HAVE_LCD_BITMAP
- status_draw();
+ status_draw(true);
#endif
lcd_update();
@@ -1932,7 +1932,7 @@
lcd_puts(0, 4, str(LANG_TIME_SET));
lcd_puts(0, 5, str(LANG_TIME_REVERT));
#ifdef HAVE_LCD_BITMAP
- status_draw();
+ status_draw(true);
#endif
lcd_update();
Index: sleeptimer.c
===================================================================
RCS file: /cvsroot/rockbox/apps/sleeptimer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- sleeptimer.c 15 Jan 2003 14:16:21 -0000 1.5
+++ sleeptimer.c 23 Apr 2003 11:26:22 -0000 1.6
@@ -147,7 +147,7 @@
lcd_puts(0, 1, str(LANG_OFF));
}
- status_draw();
+ status_draw(true);
lcd_update();
}
Index: sound_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/sound_menu.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- sound_menu.c 20 Apr 2003 22:00:26 -0000 1.34
+++ sound_menu.c 23 Apr 2003 11:26:22 -0000 1.35
@@ -83,7 +83,7 @@
}
}
lcd_puts(0,1,str);
- status_draw();
+ status_draw(true);
lcd_update();
changed = false;
Index: status.c
===================================================================
RCS file: /cvsroot/rockbox/apps/status.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- status.c 13 Feb 2003 21:45:18 -0000 1.39
+++ status.c 23 Apr 2003 11:26:22 -0000 1.40
@@ -16,6 +16,7 @@
* KIND, either express or implied.
*
****************************************************************************/
+#include "string.h"
#include "lcd.h"
#include "debug.h"
#include "kernel.h"
@@ -44,6 +45,19 @@
#endif
#endif
+struct status_info {
+ int battlevel;
+ int volume;
+ int hour;
+ int minute;
+ int playmode;
+ int repeat;
+ bool inserted;
+ bool shuffle;
+ bool keylock;
+ bool battery_safe;
+};
+
void status_init(void)
{
status_set_playmode(STATUS_STOP);
@@ -52,7 +66,7 @@
void status_set_playmode(enum playmode mode)
{
current_mode = mode;
- status_draw();
+ status_draw(false);
}
#if defined(HAVE_LCD_CHARCELLS)
@@ -83,36 +97,43 @@
#endif /* HAVE_LCD_CHARCELLS */
-void status_draw(void)
+void status_draw(bool force_redraw)
{
- int battlevel = battery_level();
- int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume);
-#if defined(HAVE_LCD_BITMAP) && defined(HAVE_RTC)
+ struct status_info info;
+
+#ifdef HAVE_LCD_BITMAP
+ static struct status_info lastinfo;
struct tm* tm;
-#endif
if ( !global_settings.statusbar )
return;
+#else
+ (void)force_redraw; /* players always "redraw" */
+#endif
+
+ info.battlevel = battery_level();
+ info.volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume);
+ info.inserted = charger_inserted();
#if defined(HAVE_LCD_CHARCELLS)
lcd_icon(ICON_VOLUME, true);
- if(volume > 10)
+ if(info.volume > 10)
lcd_icon(ICON_VOLUME_1, true);
else
lcd_icon(ICON_VOLUME_1, false);
- if(volume > 30)
+ if(info.volume > 30)
lcd_icon(ICON_VOLUME_2, true);
else
lcd_icon(ICON_VOLUME_2, false);
- if(volume > 50)
+ if(info.volume > 50)
lcd_icon(ICON_VOLUME_3, true);
else
lcd_icon(ICON_VOLUME_3, false);
- if(volume > 70)
+ if(info.volume > 70)
lcd_icon(ICON_VOLUME_4, true);
else
lcd_icon(ICON_VOLUME_4, false);
- if(volume > 90)
+ if(info.volume > 90)
lcd_icon(ICON_VOLUME_5, true);
else
lcd_icon(ICON_VOLUME_5, false);
@@ -137,7 +158,7 @@
default:
break;
}
- if(charger_inserted())
+ if(info.inserted)
{
global_settings.runtime = 0;
if(TIME_AFTER(current_tick, switch_tick))
@@ -174,15 +195,15 @@
}
} else {
lcd_icon(ICON_BATTERY, true);
- if(battlevel > 25)
+ if(info.battlevel > 25)
lcd_icon(ICON_BATTERY_1, true);
else
lcd_icon(ICON_BATTERY_1, false);
- if(battlevel > 50)
+ if(info.battlevel > 50)
lcd_icon(ICON_BATTERY_2, true);
else
lcd_icon(ICON_BATTERY_2, false);
- if(battlevel > 75)
+ if(info.battlevel > 75)
lcd_icon(ICON_BATTERY_3, true);
else
lcd_icon(ICON_BATTERY_3, false);
@@ -198,17 +219,31 @@
#endif
#ifdef HAVE_LCD_BITMAP
- if (global_settings.statusbar) {
- statusbar_wipe();
+
+ tm = get_time();
+ info.hour = tm->tm_hour;
+ info.minute = tm->tm_min;
+ info.shuffle = global_settings.playlist_shuffle;
+ info.keylock = keys_locked;
+ info.battery_safe = battery_level_safe();
+ info.repeat = global_settings.repeat_mode;
+
+ if (force_redraw ||
+ info.inserted ||
+ !info.battery_safe ||
+ memcmp(&info, &lastinfo, sizeof(struct status_info))) {
+ lcd_clearrect(0,0,LCD_WIDTH,8);
+
#ifdef HAVE_CHARGE_CTRL /* Recorder */
- if(charger_inserted()) {
+ if(info.inserted) {
battery_state = true;
plug_state = true;
if (charge_state > 0) /* charge || top off || trickle */
global_settings.runtime = 0;
if (charge_state == 1) { /* animate battery if charging */
- battlevel = battery_charge_step * 34; /* 34 for a better look
*/
- battlevel = battlevel > 100 ? 100 : battlevel;
+ info.battlevel = battery_charge_step * 34; /* 34 for a better
look */
+ if (info.battlevel > 100)
+ info.battlevel = 100;
if(TIME_AFTER(current_tick, switch_tick)) {
battery_charge_step=(battery_charge_step+1)%4;
switch_tick = current_tick + HZ;
@@ -217,7 +252,7 @@
}
else {
plug_state=false;
- if(battery_level_safe())
+ if(!info.battery_safe)
battery_state = true;
else /* blink battery if level is low */
if(TIME_AFTER(current_tick, switch_tick)) {
@@ -226,18 +261,17 @@
}
}
- if (battery_state)
- statusbar_icon_battery(battlevel, plug_state);
+ statusbar_icon_battery(info.battlevel, plug_state);
#else
#ifdef HAVE_FMADC /* FM */
- statusbar_icon_battery(battlevel, charger_inserted());
+ statusbar_icon_battery(info.battlevel, charger_inserted());
#else /* Player */
- statusbar_icon_battery(battlevel, false);
+ statusbar_icon_battery(info.battlevel, false);
#endif /* HAVE_FMADC */
#endif /* HAVE_CHARGE_CTRL */
- statusbar_icon_volume(volume);
+ statusbar_icon_volume(info.volume);
statusbar_icon_play_state(current_mode + Icon_Play);
- switch (global_settings.repeat_mode) {
+ switch (info.repeat) {
case REPEAT_ONE:
statusbar_icon_play_mode(Icon_RepeatOne);
break;
@@ -246,16 +280,17 @@
statusbar_icon_play_mode(Icon_Repeat);
break;
}
- if(global_settings.playlist_shuffle)
+ if(info.shuffle)
statusbar_icon_shuffle();
- if (keys_locked)
+ if (info.keylock)
statusbar_icon_lock();
#ifdef HAVE_RTC
- tm = get_time();
- statusbar_time(tm->tm_hour, tm->tm_min);
+ statusbar_time(info.hour, info.minute);
#endif
lcd_update_rect(0, 0, LCD_WIDTH, STATUSBAR_HEIGHT);
}
+
+ lastinfo = info;
#endif
}
Index: status.h
===================================================================
RCS file: /cvsroot/rockbox/apps/status.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- status.h 27 Jan 2003 15:36:48 -0000 1.6
+++ status.h 23 Apr 2003 11:26:22 -0000 1.7
@@ -35,7 +35,7 @@
#ifdef HAVE_LCD_BITMAP
bool statusbar(bool state);
#endif
-void status_draw(void);
+void status_draw(bool force_redraw);
#if defined(HAVE_LCD_CHARCELLS)
void status_set_record(bool b);
Index: tree.c
===================================================================
RCS file: /cvsroot/rockbox/apps/tree.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- tree.c 23 Apr 2003 09:21:35 -0000 1.190
+++ tree.c 23 Apr 2003 11:26:22 -0000 1.191
@@ -494,7 +494,7 @@
LCD_HEIGHT - SCROLLBAR_Y, filesindir, start,
start + tree_max_on_screen, VERTICAL);
#endif
- status_draw();
+ status_draw(false);
return filesindir;
}
@@ -511,7 +511,7 @@
lcd_clear_display();
lcd_puts(0,0,str(LANG_RESUME_ASK));
#ifdef HAVE_LCD_CHARCELLS
- status_draw();
+ status_draw(false);
lcd_puts(0,1,str(LANG_RESUME_CONFIRM_PLAYER));
#else
lcd_puts(0,1,str(LANG_RESUME_CONFIRM_RECORDER));
@@ -621,7 +621,7 @@
}
status_set_playmode(STATUS_PLAY);
- status_draw();
+ status_draw(true);
wps_show();
}
}
@@ -839,7 +839,7 @@
case BUTTON_OFF:
mpeg_stop();
status_set_playmode(STATUS_STOP);
- status_draw();
+ status_draw(false);
restore = true;
break;
@@ -996,7 +996,7 @@
}
status_set_playmode(STATUS_PLAY);
- status_draw();
+ status_draw(false);
lcd_stop_scroll();
if ( wps_show() == SYS_USB_CONNECTED ) {
reload_root = true;
@@ -1136,7 +1136,7 @@
break;
case BUTTON_NONE:
- status_draw();
+ status_draw(false);
break;
}
Index: wps-display.c
===================================================================
RCS file: /cvsroot/rockbox/apps/wps-display.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- wps-display.c 23 Apr 2003 09:17:33 -0000 1.70
+++ wps-display.c 23 Apr 2003 11:26:22 -0000 1.71
@@ -801,7 +801,7 @@
#endif
global_settings.resume_index = -1;
status_set_playmode(STATUS_STOP);
- status_draw();
+ status_draw(true);
sleep(HZ);
return true;
}
@@ -827,7 +827,7 @@
}
yield();
wps_refresh(id3, 0, WPS_REFRESH_ALL);
- status_draw();
+ status_draw(true);
lcd_update();
return false;
}
Index: wps.c
===================================================================
RCS file: /cvsroot/rockbox/apps/wps.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- wps.c 23 Apr 2003 11:00:39 -0000 1.187
+++ wps.c 23 Apr 2003 11:26:23 -0000 1.188
@@ -103,7 +103,7 @@
if (!exit)
button = button_get(true);
}
- status_draw();
+ status_draw(false);
wps_refresh(id3,0, WPS_REFRESH_ALL);
}
#endif
@@ -443,7 +443,7 @@
if (id3)
wps_refresh(id3, 0, WPS_REFRESH_NON_STATIC);
- status_draw();
+ status_draw(false);
/* save resume data */
if ( id3 &&
@@ -488,7 +488,7 @@
#endif
return false;
}
- status_draw();
+ status_draw(false);
while (button_get(false)); /* clear button queue */
while (!exit) {
@@ -560,7 +560,7 @@
#ifdef HAVE_LCD_CHARCELLS
status_set_param(true);
- status_draw();
+ status_draw(false);
#endif
while (!exit) {
@@ -896,7 +896,7 @@
if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME))
global_settings.volume = mpeg_sound_max(SOUND_VOLUME);
mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
- status_draw();
+ status_draw(false);
settings_save();
break;
@@ -910,7 +910,7 @@
if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME))
global_settings.volume = mpeg_sound_min(SOUND_VOLUME);
mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
- status_draw();
+ status_draw(false);
settings_save();
break;
|
