Use status_set...

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

5 files changed, 27 insertions, 23 deletions

diff --git a/apps/main_menu.c b/apps/main_menu.c
index cf31e74961..9a31687500 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -37,6 +37,7 @@
 #include "power.h"
 #include "powermgmt.h"
 #include "sound_menu.h"
+#include "status.h"
 
 #include "lang.h"
 
@@ -241,11 +242,11 @@ bool main_menu(void)
 
     m=menu_init( items, sizeof items / sizeof(struct menu_items) );
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_PARAM, true);
+    status_set_param(true);
 #endif
     result = menu_run(m);
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_PARAM, false);
+    status_set_param(false);
 #endif
     menu_exit(m);
 
diff --git a/apps/menu.c b/apps/menu.c
index 7051850a49..e271254412 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -333,7 +333,7 @@ bool menu_run(int m)
             case SYS_USB_CONNECTED:
                 usb_screen();
 #ifdef HAVE_LCD_CHARCELLS
-                lcd_icon(ICON_PARAM, false);
+                status_set_param(false);
 #endif
                 return true;
         }
diff --git a/apps/screens.c b/apps/screens.c
index 6ec0695e24..d8a2aeacd1 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -89,9 +89,9 @@ void usb_display_info(void)
     lcd_update();
 #else
     lcd_puts(0, 0, "[USB Mode]");
-    lcd_icon(ICON_PARAM, false);
-    lcd_icon(ICON_AUDIO, false);
-    lcd_icon(ICON_USB, true);
+    status_set_param(false);
+    status_set_audio(false);
+    status_set_usb(true);
 #endif
 }
 
diff --git a/apps/viewer.c b/apps/viewer.c
index 1572cbef48..a588852b4c 100644
--- a/apps/viewer.c
+++ b/apps/viewer.c
@@ -30,6 +30,8 @@
 #include "settings.h"
 #include "icons.h"
 #include "screens.h"
+#include "status.h"
+
 
 #define BUFFER_SIZE 1024
 
@@ -423,7 +425,7 @@ bool viewer_run(char* file)
             case SYS_USB_CONNECTED:
                 usb_screen();
 #ifdef HAVE_LCD_CHARCELLS
-                lcd_icon(ICON_PARAM, false);
+                status_set_param(false);
 #endif
                 viewer_exit();
                 return true;
diff --git a/apps/wps.c b/apps/wps.c
index 1544dcad6f..3c486b1786 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -447,8 +447,8 @@ static bool keylock(void)
     bool exit = false;
 
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_RECORD, true);
-    lcd_icon(ICON_PARAM, false);
+    status_set_record(true);
+    status_set_param(false);
 #endif
     display_keylock_text(true);
     keys_locked = true;
@@ -468,7 +468,7 @@ static bool keylock(void)
             case BUTTON_MENU | BUTTON_REPEAT | BUTTON_STOP:
 #endif
 #ifdef HAVE_LCD_CHARCELLS
-                lcd_icon(ICON_RECORD, false);
+                status_set_record(false);
 #endif
                 display_keylock_text(false);
                 keys_locked = false;
@@ -515,7 +515,8 @@ static bool menu(void)
     int last_button = 0;
 
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_PARAM, true);
+    status_set_param(true);
+    status_draw();
 #endif
 
     while (!exit) {
@@ -555,7 +556,7 @@ static bool menu(void)
                     mpeg_sound_set(SOUND_VOLUME, 0);
                 muted = !muted;
 #ifdef HAVE_LCD_CHARCELLS
-                lcd_icon(ICON_PARAM, false);
+                status_set_param(false);
 #endif
                 display_mute_text(muted);
                 break;
@@ -583,16 +584,16 @@ static bool menu(void)
 
                 /* show id3 tags */
             case BUTTON_MENU | BUTTON_ON:
-                lcd_icon(ICON_PARAM, true);
-                lcd_icon(ICON_AUDIO, true);
+                status_set_param(true);
+                status_set_audio(true);
 #else
             case BUTTON_F1 | BUTTON_ON:
 #endif
                 if(browse_id3() == SYS_USB_CONNECTED)
                     return true;
 #ifdef HAVE_PLAYER_KEYPAD
-                lcd_icon(ICON_PARAM, false);
-                lcd_icon(ICON_AUDIO, true);
+                status_set_param(false);
+                status_set_audio(true);
 #endif
                 exit = true;
                 break;
@@ -606,7 +607,7 @@ static bool menu(void)
     }
 
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_PARAM, false);
+    status_set_param(false);
 #endif
 
     if (wps_display(id3))
@@ -625,8 +626,8 @@ int wps_show(void)
     id3 = NULL;
 
 #ifdef HAVE_LCD_CHARCELLS
-    lcd_icon(ICON_AUDIO, true);
-    lcd_icon(ICON_PARAM, false);
+    status_set_audio(true);
+    status_set_param(false);
 #else
     if(global_settings.statusbar)
         lcd_setmargins(0, STATUSBAR_HEIGHT);
@@ -696,8 +697,8 @@ int wps_show(void)
                     case 0:
                         /* otherwise, exit to browser */
 #else
-                        lcd_icon(ICON_RECORD, false);
-                        lcd_icon(ICON_AUDIO, false);
+                        status_set_record(false);
+                        status_set_audio(false);
 #endif
                         /* set dir browser to current playing song */
                         if (global_settings.browse_current && id3)
@@ -829,8 +830,8 @@ int wps_show(void)
                     break;
 #endif
 #ifdef HAVE_LCD_CHARCELLS
-                lcd_icon(ICON_RECORD, false);
-                lcd_icon(ICON_AUDIO, false);
+                status_set_record(false);
+                status_set_audio(false);
 #endif
                 /* set dir browser to current playing song */
                 if (global_settings.browse_current && id3)