Improved statusbar icons in recording screen by Davide Gentile

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

2 files changed, 58 insertions, 20 deletions

diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index fc271e8..80021b1 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -79,27 +79,44 @@ const unsigned char bitmap_icons_7x8[][7] =
 
 const unsigned char bitmap_icons_18x8[][18] =
 {
-    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x1c, 0x2a,
-     0x12, 0x00, 0x1e, 0x30, 0x10}, /* mp3 64kbps */
-    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x04, 0x0a,
-     0x3e, 0x00, 0x1c, 0x2a, 0x12}, /* mp3 96kbps */
-    {0x00, 0x00, 0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x3e, 0x00, 0x32, 0x2a,
-     0x24, 0x00, 0x14, 0x2a, 0x14}, /* mp3 128kbps */
-    {0x00, 0x00, 0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x3e, 0x00, 0x1c, 0x2a,
-     0x12, 0x00, 0x1c, 0x22, 0x1c}, /* mp3 160kbps */
-    {0x00, 0x00, 0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x3e, 0x00, 0x04, 0x0a,
-     0x3e, 0x00, 0x32, 0x2a, 0x24}, /* mp3 192kbps */
-    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x32, 0x2a, 0x24, 0x00, 0x32, 0x2a,
-     0x24, 0x00, 0x1e, 0x30, 0x10}, /* mp3 224kbps */
-    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x00, 0x22, 0x2a, 0x14, 0x00, 0x32, 0x2a,
-     0x24, 0x00, 0x1c, 0x22, 0x1c}, /* mp3 320kbps */
-    {0x00, 0x00, 0x00, 0x00, 0x1e, 0x20, 0x18, 0x20, 0x1e, 0x00, 0x1e, 0x20, 0x18,
-    0x06, 0x00, 0x00, 0x00, 0x00}, /* wv */
-    {0x00, 0x1e, 0x20, 0x18, 0x20, 0x1e, 0x00, 0x3c, 0x12, 0x12, 0x3c, 0x00, 0x1e,
-    0x20, 0x18, 0x06, 0x00, 0x00}  /* wav */
+    {0x00, 0x00, 0x00, 0x00,0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x3e, 0x2a,
+     0x3a, 0x00, 0x0e, 0x08, 0x3e, 0x00}, /* mp3 64kbps */
+    {0x00, 0x00, 0x00, 0x00,0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x0e, 0x0a, 
+    0x3e, 0x00, 0x3e, 0x2a, 0x3a, 0x00}, /* mp3 96kbps */
+    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x24, 0x3e, 0x20, 0x00, 0x3a, 0x2a, 
+    0x2e, 0x00, 0x3e, 0x2a, 0x3e, 0x00}, /* mp3 128kbps */
+    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x24, 0x3e, 0x20, 0x00, 0x3e, 0x2a, 
+    0x3a, 0x00, 0x3e, 0x22, 0x3e, 0x00}, /* mp3 160kbps */
+    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x24, 0x3e, 0x20, 0x00, 0x0e, 0x0a, 
+    0x3e, 0x00, 0x3a, 0x2a, 0x2e, 0x00}, /* mp3 192kbps */
+    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x3a, 0x2a, 0x2e, 0x00, 0x3a, 0x2a, 
+    0x2e, 0x00, 0x0e, 0x08, 0x3e, 0x00}, /* mp3 224kbps */
+    {0x3e, 0x04, 0x08, 0x04, 0x3e, 0x00, 0x22, 0x2a, 0x36, 0x00, 0x3a, 0x2a, 
+    0x2e, 0x00, 0x3e, 0x22, 0x3e, 0x00}, /* mp3 320kbps */
+    {0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00,0x1e, 0x20, 0x18, 0x20, 0x1e, 
+    0x00, 0x1e, 0x20, 0x18, 0x06, 0x00}, /* wv */
+    {0x00, 0x00, 0x1e, 0x20, 0x18, 0x20, 0x1e, 0x00, 0x3c, 0x12, 0x12, 0x3c, 
+    0x00, 0x1e, 0x20, 0x18, 0x06, 0x00}  /* wav */
 };
-    
-    
+
+#if CONFIG_CODEC == SWCODEC
+const unsigned char bitmap_icons_12x8[][12] =
+{
+    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x2a, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 8khz */
+    {0x24, 0x3e, 0x20, 0x00, 0x24, 0x3e, 0x20, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 11khz */
+    {0x24, 0x3e, 0x20, 0x00, 0x3a, 0x2a, 0x2e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 12khz */
+    {0x24, 0x3e, 0x20, 0x00, 0x3e, 0x2a, 0x3a, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 16khz */
+    {0x3a, 0x2a, 0x2e, 0x00, 0x3a, 0x2a, 0x2e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 22khz */
+    {0x3a, 0x2a, 0x2e, 0x00, 0x0e, 0x08, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 24khz */
+    {0x22, 0x2a, 0x36, 0x00, 0x3a, 0x2a, 0x2e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 32khz */
+    {0x0e, 0x08, 0x3e, 0x00, 0x0e, 0x08, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 44.1khz */
+    {0x0e, 0x08, 0x3e, 0x00, 0x3e, 0x2a, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 48khz */
+    {0x3e, 0x2a, 0x3a, 0x00, 0x0e, 0x08, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 64khz */
+    {0x3e, 0x2a, 0x3e, 0x00, 0x3e, 0x2a, 0x3e, 0x00, 0x3e, 0x10, 0x28, 0x00}, /* 88.2khz */
+    {0x0e, 0x0a, 0x3e, 0x00, 0x3e, 0x2a, 0x3a, 0x00, 0x3e, 0x10, 0x28, 0x00}  /* 96khz */
+};
+#endif
+
 /* Disk/MMC activity */
 const unsigned char bitmap_icon_disk[12] =
 #ifdef HAVE_MMC
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index 5e7f157..ce7eb5f 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -85,6 +85,24 @@ enum icons_7x8 {
     Icon7x8Last
 };
 
+#if CONFIG_CODEC == SWCODEC
+enum icons_12x8 {
+    Icon_8000,
+    Icon_11025,
+    Icon_12000,
+    Icon_16000,
+    Icon_22050,
+    Icon_24000,
+    Icon_32000,
+    Icon_44100,
+    Icon_48000,
+    Icon_64000,
+    Icon_88200,
+    Icon_96000,
+    Icon12x8Last
+};
+#endif
+
 enum icons_18x8 {
     Icon_mp364,
     Icon_mp396,
@@ -100,6 +118,9 @@ enum icons_18x8 {
 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];
+#if CONFIG_CODEC == SWCODEC
+extern const unsigned char bitmap_icons_12x8[Icon12x8Last][12];
+#endif
 extern const unsigned char bitmap_icons_18x8[Icon18x8Last][18];
 extern const unsigned char bitmap_icon_disk[];