Adapted and commited Markus Kaufhold's remote hold icon on statusbar patch for iriver ; generic logo handler (now it's possible to have a different USB logo on main screen and on remote), made the quickscreen behave as it was before

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8044 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 11 insertions, 9 deletions

diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index 1306a1d770..68985c2028 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -30,11 +30,11 @@
 
 const unsigned char bitmap_icons_5x8[][5] =
 {
-    /* Lock */
-    {0x78,0x7f,0x49,0x7f,0x78}
+    [Icon_Lock_Main]  ={0x78,0x7f,0x49,0x7f,0x78}, /* Lock Main */
+    [Icon_Lock_Remote]={0x78,0x7f,0x49,0x7f,0x78}  /* Lock Remote */
 };
 
-const unsigned char bitmap_icons_6x8[LastIcon][6] =
+const unsigned char bitmap_icons_6x8[][6] =
 {
     { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */
     { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index c996fd92aa..a21b801cb9 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -29,7 +29,9 @@
 
 /* Symbolic names for icons */
 enum icons_5x8 {
-    Icon_Lock
+    Icon_Lock_Main,
+    Icon_Lock_Remote,
+    Icon5x8Last
 };
 
 enum icons_6x8 {
@@ -46,7 +48,7 @@ enum icons_6x8 {
     Icon_Bookmark,
     Icon_Queued,
     Icon_Moving,
-    LastIcon
+    Icon6x8Last
 };
 
 enum icons_7x8 {
@@ -68,12 +70,12 @@ enum icons_7x8 {
     Icon_DownArrow,
     Icon_UpArrow,
     Icon_RepeatAB,
-    Icon_Last
+    Icon7x8Last
 };
 
-extern const unsigned char bitmap_icons_5x8[1][5];
-extern const unsigned char bitmap_icons_6x8[LastIcon][6];
-extern const unsigned char bitmap_icons_7x8[Icon_Last][7];
+extern const unsigned char bitmap_icons_5x8[Icon5x8Last][5];
+extern const unsigned char bitmap_icons_6x8[Icon6x8Last][6];
+extern const unsigned char bitmap_icons_7x8[Icon7x8Last][7];
 extern const unsigned char bitmap_icon_disk[];
 
 #if  LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128)