1
0
Fork 0
forked from len0rd/rockbox

Use status_set...

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2661 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Mats Lidell 2002-10-15 12:56:05 +00:00
parent a87ce29bf8
commit 1873987315
5 changed files with 27 additions and 23 deletions

View file

@ -37,6 +37,7 @@
#include "power.h" #include "power.h"
#include "powermgmt.h" #include "powermgmt.h"
#include "sound_menu.h" #include "sound_menu.h"
#include "status.h"
#include "lang.h" #include "lang.h"
@ -241,11 +242,11 @@ bool main_menu(void)
m=menu_init( items, sizeof items / sizeof(struct menu_items) ); m=menu_init( items, sizeof items / sizeof(struct menu_items) );
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, true); status_set_param(true);
#endif #endif
result = menu_run(m); result = menu_run(m);
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
menu_exit(m); menu_exit(m);

View file

@ -333,7 +333,7 @@ bool menu_run(int m)
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:
usb_screen(); usb_screen();
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
return true; return true;
} }

View file

@ -89,9 +89,9 @@ void usb_display_info(void)
lcd_update(); lcd_update();
#else #else
lcd_puts(0, 0, "[USB Mode]"); lcd_puts(0, 0, "[USB Mode]");
lcd_icon(ICON_PARAM, false); status_set_param(false);
lcd_icon(ICON_AUDIO, false); status_set_audio(false);
lcd_icon(ICON_USB, true); status_set_usb(true);
#endif #endif
} }

View file

@ -30,6 +30,8 @@
#include "settings.h" #include "settings.h"
#include "icons.h" #include "icons.h"
#include "screens.h" #include "screens.h"
#include "status.h"
#define BUFFER_SIZE 1024 #define BUFFER_SIZE 1024
@ -423,7 +425,7 @@ bool viewer_run(char* file)
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:
usb_screen(); usb_screen();
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
viewer_exit(); viewer_exit();
return true; return true;

View file

@ -447,8 +447,8 @@ static bool keylock(void)
bool exit = false; bool exit = false;
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_RECORD, true); status_set_record(true);
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
display_keylock_text(true); display_keylock_text(true);
keys_locked = true; keys_locked = true;
@ -468,7 +468,7 @@ static bool keylock(void)
case BUTTON_MENU | BUTTON_REPEAT | BUTTON_STOP: case BUTTON_MENU | BUTTON_REPEAT | BUTTON_STOP:
#endif #endif
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_RECORD, false); status_set_record(false);
#endif #endif
display_keylock_text(false); display_keylock_text(false);
keys_locked = false; keys_locked = false;
@ -515,7 +515,8 @@ static bool menu(void)
int last_button = 0; int last_button = 0;
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, true); status_set_param(true);
status_draw();
#endif #endif
while (!exit) { while (!exit) {
@ -555,7 +556,7 @@ static bool menu(void)
mpeg_sound_set(SOUND_VOLUME, 0); mpeg_sound_set(SOUND_VOLUME, 0);
muted = !muted; muted = !muted;
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
display_mute_text(muted); display_mute_text(muted);
break; break;
@ -583,16 +584,16 @@ static bool menu(void)
/* show id3 tags */ /* show id3 tags */
case BUTTON_MENU | BUTTON_ON: case BUTTON_MENU | BUTTON_ON:
lcd_icon(ICON_PARAM, true); status_set_param(true);
lcd_icon(ICON_AUDIO, true); status_set_audio(true);
#else #else
case BUTTON_F1 | BUTTON_ON: case BUTTON_F1 | BUTTON_ON:
#endif #endif
if(browse_id3() == SYS_USB_CONNECTED) if(browse_id3() == SYS_USB_CONNECTED)
return true; return true;
#ifdef HAVE_PLAYER_KEYPAD #ifdef HAVE_PLAYER_KEYPAD
lcd_icon(ICON_PARAM, false); status_set_param(false);
lcd_icon(ICON_AUDIO, true); status_set_audio(true);
#endif #endif
exit = true; exit = true;
break; break;
@ -606,7 +607,7 @@ static bool menu(void)
} }
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_PARAM, false); status_set_param(false);
#endif #endif
if (wps_display(id3)) if (wps_display(id3))
@ -625,8 +626,8 @@ int wps_show(void)
id3 = NULL; id3 = NULL;
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_AUDIO, true); status_set_audio(true);
lcd_icon(ICON_PARAM, false); status_set_param(false);
#else #else
if(global_settings.statusbar) if(global_settings.statusbar)
lcd_setmargins(0, STATUSBAR_HEIGHT); lcd_setmargins(0, STATUSBAR_HEIGHT);
@ -696,8 +697,8 @@ int wps_show(void)
case 0: case 0:
/* otherwise, exit to browser */ /* otherwise, exit to browser */
#else #else
lcd_icon(ICON_RECORD, false); status_set_record(false);
lcd_icon(ICON_AUDIO, false); status_set_audio(false);
#endif #endif
/* set dir browser to current playing song */ /* set dir browser to current playing song */
if (global_settings.browse_current && id3) if (global_settings.browse_current && id3)
@ -829,8 +830,8 @@ int wps_show(void)
break; break;
#endif #endif
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_RECORD, false); status_set_record(false);
lcd_icon(ICON_AUDIO, false); status_set_audio(false);
#endif #endif
/* set dir browser to current playing song */ /* set dir browser to current playing song */
if (global_settings.browse_current && id3) if (global_settings.browse_current && id3)