diff options
author | Mats Lidell <matsl@rockbox.org> | 2002-10-15 12:56:05 +0000 |
---|---|---|
committer | Mats Lidell <matsl@rockbox.org> | 2002-10-15 12:56:05 +0000 |
commit | 18739873154648ea6fbb40623cc021b2d4ca0a5d (patch) | |
tree | d3e417c6b2eb6c70ba87320a8c7e45dae03716fd /apps | |
parent | a87ce29bf87041e6c022f8d3215e5de948bcddea (diff) | |
download | rockbox-18739873154648ea6fbb40623cc021b2d4ca0a5d.tar.gz rockbox-18739873154648ea6fbb40623cc021b2d4ca0a5d.zip |
Use status_set...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2661 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main_menu.c | 5 | ||||
-rw-r--r-- | apps/menu.c | 2 | ||||
-rw-r--r-- | apps/screens.c | 6 | ||||
-rw-r--r-- | apps/viewer.c | 4 | ||||
-rw-r--r-- | apps/wps.c | 33 |
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 @@ | |||
37 | #include "power.h" | 37 | #include "power.h" |
38 | #include "powermgmt.h" | 38 | #include "powermgmt.h" |
39 | #include "sound_menu.h" | 39 | #include "sound_menu.h" |
40 | #include "status.h" | ||
40 | 41 | ||
41 | #include "lang.h" | 42 | #include "lang.h" |
42 | 43 | ||
@@ -241,11 +242,11 @@ bool main_menu(void) | |||
241 | 242 | ||
242 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); | 243 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); |
243 | #ifdef HAVE_LCD_CHARCELLS | 244 | #ifdef HAVE_LCD_CHARCELLS |
244 | lcd_icon(ICON_PARAM, true); | 245 | status_set_param(true); |
245 | #endif | 246 | #endif |
246 | result = menu_run(m); | 247 | result = menu_run(m); |
247 | #ifdef HAVE_LCD_CHARCELLS | 248 | #ifdef HAVE_LCD_CHARCELLS |
248 | lcd_icon(ICON_PARAM, false); | 249 | status_set_param(false); |
249 | #endif | 250 | #endif |
250 | menu_exit(m); | 251 | menu_exit(m); |
251 | 252 | ||
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) | |||
333 | case SYS_USB_CONNECTED: | 333 | case SYS_USB_CONNECTED: |
334 | usb_screen(); | 334 | usb_screen(); |
335 | #ifdef HAVE_LCD_CHARCELLS | 335 | #ifdef HAVE_LCD_CHARCELLS |
336 | lcd_icon(ICON_PARAM, false); | 336 | status_set_param(false); |
337 | #endif | 337 | #endif |
338 | return true; | 338 | return true; |
339 | } | 339 | } |
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) | |||
89 | lcd_update(); | 89 | lcd_update(); |
90 | #else | 90 | #else |
91 | lcd_puts(0, 0, "[USB Mode]"); | 91 | lcd_puts(0, 0, "[USB Mode]"); |
92 | lcd_icon(ICON_PARAM, false); | 92 | status_set_param(false); |
93 | lcd_icon(ICON_AUDIO, false); | 93 | status_set_audio(false); |
94 | lcd_icon(ICON_USB, true); | 94 | status_set_usb(true); |
95 | #endif | 95 | #endif |
96 | } | 96 | } |
97 | 97 | ||
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 @@ | |||
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | #include "icons.h" | 31 | #include "icons.h" |
32 | #include "screens.h" | 32 | #include "screens.h" |
33 | #include "status.h" | ||
34 | |||
33 | 35 | ||
34 | #define BUFFER_SIZE 1024 | 36 | #define BUFFER_SIZE 1024 |
35 | 37 | ||
@@ -423,7 +425,7 @@ bool viewer_run(char* file) | |||
423 | case SYS_USB_CONNECTED: | 425 | case SYS_USB_CONNECTED: |
424 | usb_screen(); | 426 | usb_screen(); |
425 | #ifdef HAVE_LCD_CHARCELLS | 427 | #ifdef HAVE_LCD_CHARCELLS |
426 | lcd_icon(ICON_PARAM, false); | 428 | status_set_param(false); |
427 | #endif | 429 | #endif |
428 | viewer_exit(); | 430 | viewer_exit(); |
429 | return true; | 431 | 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) | |||
447 | bool exit = false; | 447 | bool exit = false; |
448 | 448 | ||
449 | #ifdef HAVE_LCD_CHARCELLS | 449 | #ifdef HAVE_LCD_CHARCELLS |
450 | lcd_icon(ICON_RECORD, true); | 450 | status_set_record(true); |
451 | lcd_icon(ICON_PARAM, false); | 451 | status_set_param(false); |
452 | #endif | 452 | #endif |
453 | display_keylock_text(true); | 453 | display_keylock_text(true); |
454 | keys_locked = true; | 454 | keys_locked = true; |
@@ -468,7 +468,7 @@ static bool keylock(void) | |||
468 | case BUTTON_MENU | BUTTON_REPEAT | BUTTON_STOP: | 468 | case BUTTON_MENU | BUTTON_REPEAT | BUTTON_STOP: |
469 | #endif | 469 | #endif |
470 | #ifdef HAVE_LCD_CHARCELLS | 470 | #ifdef HAVE_LCD_CHARCELLS |
471 | lcd_icon(ICON_RECORD, false); | 471 | status_set_record(false); |
472 | #endif | 472 | #endif |
473 | display_keylock_text(false); | 473 | display_keylock_text(false); |
474 | keys_locked = false; | 474 | keys_locked = false; |
@@ -515,7 +515,8 @@ static bool menu(void) | |||
515 | int last_button = 0; | 515 | int last_button = 0; |
516 | 516 | ||
517 | #ifdef HAVE_LCD_CHARCELLS | 517 | #ifdef HAVE_LCD_CHARCELLS |
518 | lcd_icon(ICON_PARAM, true); | 518 | status_set_param(true); |
519 | status_draw(); | ||
519 | #endif | 520 | #endif |
520 | 521 | ||
521 | while (!exit) { | 522 | while (!exit) { |
@@ -555,7 +556,7 @@ static bool menu(void) | |||
555 | mpeg_sound_set(SOUND_VOLUME, 0); | 556 | mpeg_sound_set(SOUND_VOLUME, 0); |
556 | muted = !muted; | 557 | muted = !muted; |
557 | #ifdef HAVE_LCD_CHARCELLS | 558 | #ifdef HAVE_LCD_CHARCELLS |
558 | lcd_icon(ICON_PARAM, false); | 559 | status_set_param(false); |
559 | #endif | 560 | #endif |
560 | display_mute_text(muted); | 561 | display_mute_text(muted); |
561 | break; | 562 | break; |
@@ -583,16 +584,16 @@ static bool menu(void) | |||
583 | 584 | ||
584 | /* show id3 tags */ | 585 | /* show id3 tags */ |
585 | case BUTTON_MENU | BUTTON_ON: | 586 | case BUTTON_MENU | BUTTON_ON: |
586 | lcd_icon(ICON_PARAM, true); | 587 | status_set_param(true); |
587 | lcd_icon(ICON_AUDIO, true); | 588 | status_set_audio(true); |
588 | #else | 589 | #else |
589 | case BUTTON_F1 | BUTTON_ON: | 590 | case BUTTON_F1 | BUTTON_ON: |
590 | #endif | 591 | #endif |
591 | if(browse_id3() == SYS_USB_CONNECTED) | 592 | if(browse_id3() == SYS_USB_CONNECTED) |
592 | return true; | 593 | return true; |
593 | #ifdef HAVE_PLAYER_KEYPAD | 594 | #ifdef HAVE_PLAYER_KEYPAD |
594 | lcd_icon(ICON_PARAM, false); | 595 | status_set_param(false); |
595 | lcd_icon(ICON_AUDIO, true); | 596 | status_set_audio(true); |
596 | #endif | 597 | #endif |
597 | exit = true; | 598 | exit = true; |
598 | break; | 599 | break; |
@@ -606,7 +607,7 @@ static bool menu(void) | |||
606 | } | 607 | } |
607 | 608 | ||
608 | #ifdef HAVE_LCD_CHARCELLS | 609 | #ifdef HAVE_LCD_CHARCELLS |
609 | lcd_icon(ICON_PARAM, false); | 610 | status_set_param(false); |
610 | #endif | 611 | #endif |
611 | 612 | ||
612 | if (wps_display(id3)) | 613 | if (wps_display(id3)) |
@@ -625,8 +626,8 @@ int wps_show(void) | |||
625 | id3 = NULL; | 626 | id3 = NULL; |
626 | 627 | ||
627 | #ifdef HAVE_LCD_CHARCELLS | 628 | #ifdef HAVE_LCD_CHARCELLS |
628 | lcd_icon(ICON_AUDIO, true); | 629 | status_set_audio(true); |
629 | lcd_icon(ICON_PARAM, false); | 630 | status_set_param(false); |
630 | #else | 631 | #else |
631 | if(global_settings.statusbar) | 632 | if(global_settings.statusbar) |
632 | lcd_setmargins(0, STATUSBAR_HEIGHT); | 633 | lcd_setmargins(0, STATUSBAR_HEIGHT); |
@@ -696,8 +697,8 @@ int wps_show(void) | |||
696 | case 0: | 697 | case 0: |
697 | /* otherwise, exit to browser */ | 698 | /* otherwise, exit to browser */ |
698 | #else | 699 | #else |
699 | lcd_icon(ICON_RECORD, false); | 700 | status_set_record(false); |
700 | lcd_icon(ICON_AUDIO, false); | 701 | status_set_audio(false); |
701 | #endif | 702 | #endif |
702 | /* set dir browser to current playing song */ | 703 | /* set dir browser to current playing song */ |
703 | if (global_settings.browse_current && id3) | 704 | if (global_settings.browse_current && id3) |
@@ -829,8 +830,8 @@ int wps_show(void) | |||
829 | break; | 830 | break; |
830 | #endif | 831 | #endif |
831 | #ifdef HAVE_LCD_CHARCELLS | 832 | #ifdef HAVE_LCD_CHARCELLS |
832 | lcd_icon(ICON_RECORD, false); | 833 | status_set_record(false); |
833 | lcd_icon(ICON_AUDIO, false); | 834 | status_set_audio(false); |
834 | #endif | 835 | #endif |
835 | /* set dir browser to current playing song */ | 836 | /* set dir browser to current playing song */ |
836 | if (global_settings.browse_current && id3) | 837 | if (global_settings.browse_current && id3) |