Index: apps/status.c =================================================================== RCS file: /cvsroot/rockbox/apps/status.c,v retrieving revision 1.72 diff -u -r1.72 status.c --- apps/status.c 6 Jul 2005 22:57:54 -0000 1.72 +++ apps/status.c 6 Aug 2005 12:46:14 -0000 @@ -60,6 +60,7 @@ bool inserted; bool shuffle; bool keylock; + bool keylockremote; bool battery_safe; bool redraw_volume; /* true if the volume gauge needs updating */ #if CONFIG_LED == LED_VIRTUAL @@ -168,6 +169,7 @@ info.shuffle = global_settings.playlist_shuffle; #if CONFIG_KEYPAD == IRIVER_H100_PAD info.keylock = button_hold(); + info.keylockremote = remote_button_hold(); #else info.keylock = keys_locked; #endif @@ -268,6 +270,8 @@ statusbar_icon_shuffle(); if (info.keylock) statusbar_icon_lock(); + if (info.keylockremote) + statusbar_icon_lock_remote(); #ifdef HAVE_RTC statusbar_time(info.hour, info.minute); #endif Index: apps/recorder/icons.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/icons.c,v retrieving revision 1.65 diff -u -r1.65 icons.c --- apps/recorder/icons.c 6 Jul 2005 22:57:54 -0000 1.65 +++ apps/recorder/icons.c 6 Aug 2005 12:46:21 -0000 @@ -28,10 +28,10 @@ #include "icons.h" -const unsigned char bitmap_icons_5x8[][5] = +const unsigned char bitmap_icons_5x8[Icon5x8Last][5] = { - /* Lock */ - {0x78,0x7f,0x49,0x7f,0x78} + {0x78,0x7f,0x49,0x7f,0x78}, /* Lock Main */ + {0x78,0x4f,0x79,0x4f,0x78} /* Lock Remote */ }; const unsigned char bitmap_icons_6x8[LastIcon][6] = @@ -496,13 +496,16 @@ STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT); } -/* - * Print lock when keys are locked - */ void statusbar_icon_lock(void) { - lcd_mono_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, - STATUSBAR_Y_POS, 5, 8); + lcd_mono_bitmap(bitmap_icons_5x8[Icon_Lock_Main], LOCKM_X_POS, + STATUSBAR_Y_POS, LOCKM_WIDTH, STATUSBAR_HEIGHT); +} + +void statusbar_icon_lock_remote(void) +{ + lcd_mono_bitmap(bitmap_icons_5x8[Icon_Lock_Remote], LOCKR_X_POS, + STATUSBAR_Y_POS, LOCKR_WIDTH, STATUSBAR_HEIGHT); } #if CONFIG_LED == LED_VIRTUAL Index: apps/recorder/icons.h =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/icons.h,v retrieving revision 1.40 diff -u -r1.40 icons.h --- apps/recorder/icons.h 6 Jul 2005 22:57:54 -0000 1.40 +++ apps/recorder/icons.h 6 Aug 2005 12:46:22 -0000 @@ -38,7 +38,9 @@ /* Symbolic names for icons */ enum icons_5x8 { - Icon_Lock + Icon_Lock_Main, + Icon_Lock_Remote, + Icon5x8Last }; enum icons_7x8 { @@ -61,7 +63,7 @@ Icon_Last }; -extern const unsigned char bitmap_icons_5x8[1][5]; +extern const unsigned char bitmap_icons_5x8[Icon5x8Last][5]; extern const unsigned char bitmap_icons_6x8[LastIcon][6]; extern const unsigned char bitmap_icons_7x8[Icon_Last][7]; #if CONFIG_LED == LED_VIRTUAL @@ -91,8 +93,10 @@ #define ICON_PLAY_MODE_WIDTH 7 #define ICON_SHUFFLE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+ICON_PLAY_MODE_WIDTH+2+2+2+2+2 #define ICON_SHUFFLE_WIDTH 7 -#define LOCK_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+ICON_PLAY_MODE_WIDTH+ICON_SHUFFLE_WIDTH+2+2+2+2+2+2 -#define LOCK_WIDTH 5 +#define LOCKM_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+ICON_PLAY_MODE_WIDTH+ICON_SHUFFLE_WIDTH+2+2+2+2+2+2 +#define LOCKM_WIDTH 5 +#define LOCKR_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+ICON_PLAY_MODE_WIDTH+ICON_SHUFFLE_WIDTH+LOCKM_WIDTH+2+2+2+2+2+2+2 +#define LOCKR_WIDTH 5 #define ICON_DISK_WIDTH 12 #define ICON_DISK_X_POS STATUSBAR_WIDTH-ICON_DISK_WIDTH #define TIME_X_END STATUSBAR_WIDTH-1 @@ -104,6 +108,7 @@ extern void statusbar_icon_play_mode(int mode); extern void statusbar_icon_shuffle(void); extern void statusbar_icon_lock(void); +extern void statusbar_icon_lock_remote(void); #ifdef HAVE_RTC extern void statusbar_time(int hour, int minute); #endif