diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 22:05:41 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 22:05:41 +0000 |
commit | d4b884e7e0568d33e4f1bfad51886f6a87373d53 (patch) | |
tree | d7b8071cfea0f41dbea75c4a12cf5bd628105982 /apps | |
parent | 56e5d1a0a1f87f24635207f70c42b5efc3fe35ab (diff) | |
download | rockbox-d4b884e7e0568d33e4f1bfad51886f6a87373d53.tar.gz rockbox-d4b884e7e0568d33e4f1bfad51886f6a87373d53.zip |
'End of song list' message now displays for 1 second and then exits to file browser.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2551 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 6 | ||||
-rw-r--r-- | apps/wps-display.c | 8 | ||||
-rw-r--r-- | apps/wps-display.h | 2 | ||||
-rw-r--r-- | apps/wps.c | 33 |
4 files changed, 29 insertions, 20 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 5c7b0a3b86..ca4c89beaa 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -611,17 +611,17 @@ new: | |||
611 | 611 | ||
612 | id: LANG_END_CONFIRM_PLAYER | 612 | id: LANG_END_CONFIRM_PLAYER |
613 | desc: when playlist has finished | 613 | desc: when playlist has finished |
614 | eng: "<Press ON>" | 614 | eng: "" |
615 | new: | 615 | new: |
616 | 616 | ||
617 | id: LANG_END_PLAYLIST_RECORDER | 617 | id: LANG_END_PLAYLIST_RECORDER |
618 | desc: when playlist has finished | 618 | desc: when playlist has finished |
619 | eng: "<End of song list>" | 619 | eng: "End of song list" |
620 | new: | 620 | new: |
621 | 621 | ||
622 | id: LANG_END_CONFIRM_RECORDER | 622 | id: LANG_END_CONFIRM_RECORDER |
623 | desc: when playlist has finished | 623 | desc: when playlist has finished |
624 | eng: "Press ON" | 624 | eng: "" |
625 | new: | 625 | new: |
626 | 626 | ||
627 | id: LANG_SNAKE_SCORE | 627 | id: LANG_SNAKE_SCORE |
diff --git a/apps/wps-display.c b/apps/wps-display.c index 2972fc0a33..3dda50842f 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -616,7 +616,7 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all) | |||
616 | return true; | 616 | return true; |
617 | } | 617 | } |
618 | 618 | ||
619 | void wps_display(struct mp3entry* id3) | 619 | bool wps_display(struct mp3entry* id3) |
620 | { | 620 | { |
621 | lcd_clear_display(); | 621 | lcd_clear_display(); |
622 | 622 | ||
@@ -624,11 +624,12 @@ void wps_display(struct mp3entry* id3) | |||
624 | { | 624 | { |
625 | #ifdef HAVE_LCD_CHARCELLS | 625 | #ifdef HAVE_LCD_CHARCELLS |
626 | lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); | 626 | lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); |
627 | lcd_puts(0, 1, str(LANG_END_CONFIRM_PLAYER)); | ||
628 | #else | 627 | #else |
629 | lcd_puts(0, 2, str(LANG_END_PLAYLIST_RECORDER)); | 628 | lcd_puts(0, 2, str(LANG_END_PLAYLIST_RECORDER)); |
630 | lcd_puts(5, 4, str(LANG_END_CONFIRM_RECORDER)); | 629 | lcd_update(); |
631 | #endif | 630 | #endif |
631 | sleep(HZ); | ||
632 | return true; | ||
632 | } | 633 | } |
633 | else | 634 | else |
634 | { | 635 | { |
@@ -653,6 +654,7 @@ void wps_display(struct mp3entry* id3) | |||
653 | wps_refresh(id3, 0, true); | 654 | wps_refresh(id3, 0, true); |
654 | status_draw(); | 655 | status_draw(); |
655 | lcd_update(); | 656 | lcd_update(); |
657 | return false; | ||
656 | } | 658 | } |
657 | 659 | ||
658 | #if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR) | 660 | #if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR) |
diff --git a/apps/wps-display.h b/apps/wps-display.h index 439660e831..970bca1842 100644 --- a/apps/wps-display.h +++ b/apps/wps-display.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "id3.h" | 23 | #include "id3.h" |
24 | 24 | ||
25 | bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_scroll); | 25 | bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_scroll); |
26 | void wps_display(struct mp3entry* id3); | 26 | bool wps_display(struct mp3entry* id3); |
27 | bool wps_load(char* file, bool display); | 27 | bool wps_load(char* file, bool display); |
28 | 28 | ||
29 | #ifdef HAVE_LCD_CHARCELLS | 29 | #ifdef HAVE_LCD_CHARCELLS |
diff --git a/apps/wps.c b/apps/wps.c index d2e89adff5..e740216d96 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -280,7 +280,6 @@ static int browse_id3(void) | |||
280 | #endif | 280 | #endif |
281 | case BUTTON_PLAY: | 281 | case BUTTON_PLAY: |
282 | lcd_stop_scroll(); | 282 | lcd_stop_scroll(); |
283 | wps_display(id3); | ||
284 | exit = true; | 283 | exit = true; |
285 | break; | 284 | break; |
286 | 285 | ||
@@ -391,7 +390,8 @@ static bool ffwd_rew(int button) | |||
391 | status_set_playmode(STATUS_PLAY); | 390 | status_set_playmode(STATUS_PLAY); |
392 | } | 391 | } |
393 | #ifdef HAVE_LCD_CHARCELLS | 392 | #ifdef HAVE_LCD_CHARCELLS |
394 | wps_display(id3); | 393 | if (wps_display(id3)) |
394 | return true; | ||
395 | #endif | 395 | #endif |
396 | exit = true; | 396 | exit = true; |
397 | break; | 397 | break; |
@@ -409,7 +409,7 @@ static bool ffwd_rew(int button) | |||
409 | return usb; | 409 | return usb; |
410 | } | 410 | } |
411 | 411 | ||
412 | static void update(void) | 412 | static bool update(void) |
413 | { | 413 | { |
414 | bool track_changed = mpeg_has_changed_track(); | 414 | bool track_changed = mpeg_has_changed_track(); |
415 | 415 | ||
@@ -417,13 +417,13 @@ static void update(void) | |||
417 | { | 417 | { |
418 | lcd_stop_scroll(); | 418 | lcd_stop_scroll(); |
419 | id3 = mpeg_current_track(); | 419 | id3 = mpeg_current_track(); |
420 | wps_display(id3); | 420 | if (wps_display(id3)) |
421 | return true; | ||
421 | wps_refresh(id3,0,true); | 422 | wps_refresh(id3,0,true); |
422 | } | 423 | } |
423 | 424 | ||
424 | if (id3) { | 425 | if (id3) |
425 | wps_refresh(id3,0,false); | 426 | wps_refresh(id3,0,false); |
426 | } | ||
427 | 427 | ||
428 | status_draw(); | 428 | status_draw(); |
429 | 429 | ||
@@ -442,6 +442,8 @@ static void update(void) | |||
442 | global_settings.resume_offset = -1; | 442 | global_settings.resume_offset = -1; |
443 | settings_save(); | 443 | settings_save(); |
444 | } | 444 | } |
445 | |||
446 | return false; | ||
445 | } | 447 | } |
446 | 448 | ||
447 | 449 | ||
@@ -456,7 +458,8 @@ static bool keylock(void) | |||
456 | display_keylock_text(true); | 458 | display_keylock_text(true); |
457 | keys_locked = true; | 459 | keys_locked = true; |
458 | wps_refresh(id3,0,true); | 460 | wps_refresh(id3,0,true); |
459 | wps_display(id3); | 461 | if (wps_display(id3)) |
462 | return true; | ||
460 | status_draw(); | 463 | status_draw(); |
461 | while (button_get(false)); /* clear button queue */ | 464 | while (button_get(false)); /* clear button queue */ |
462 | 465 | ||
@@ -501,7 +504,8 @@ static bool keylock(void) | |||
501 | display_keylock_text(true); | 504 | display_keylock_text(true); |
502 | while (button_get(false)); /* clear button queue */ | 505 | while (button_get(false)); /* clear button queue */ |
503 | wps_refresh(id3,0,true); | 506 | wps_refresh(id3,0,true); |
504 | wps_display(id3); | 507 | if(wps_display(id3)) |
508 | return true; | ||
505 | break; | 509 | break; |
506 | } | 510 | } |
507 | } | 511 | } |
@@ -595,7 +599,6 @@ static bool menu(void) | |||
595 | lcd_icon(ICON_PARAM, false); | 599 | lcd_icon(ICON_PARAM, false); |
596 | lcd_icon(ICON_AUDIO, true); | 600 | lcd_icon(ICON_AUDIO, true); |
597 | #endif | 601 | #endif |
598 | wps_display(id3); | ||
599 | exit = true; | 602 | exit = true; |
600 | break; | 603 | break; |
601 | 604 | ||
@@ -610,7 +613,8 @@ static bool menu(void) | |||
610 | lcd_icon(ICON_PARAM, false); | 613 | lcd_icon(ICON_PARAM, false); |
611 | #endif | 614 | #endif |
612 | 615 | ||
613 | wps_display(id3); | 616 | if (wps_display(id3)) |
617 | return true; | ||
614 | wps_refresh(id3,0,true); | 618 | wps_refresh(id3,0,true); |
615 | return false; | 619 | return false; |
616 | } | 620 | } |
@@ -644,7 +648,8 @@ int wps_show(void) | |||
644 | { | 648 | { |
645 | id3 = mpeg_current_track(); | 649 | id3 = mpeg_current_track(); |
646 | if (id3) { | 650 | if (id3) { |
647 | wps_display(id3); | 651 | if (wps_display(id3)) |
652 | return 0; | ||
648 | wps_refresh(id3,0,true); | 653 | wps_refresh(id3,0,true); |
649 | } | 654 | } |
650 | restore = true; | 655 | restore = true; |
@@ -851,7 +856,8 @@ int wps_show(void) | |||
851 | return SYS_USB_CONNECTED; | 856 | return SYS_USB_CONNECTED; |
852 | 857 | ||
853 | case BUTTON_NONE: /* Timeout */ | 858 | case BUTTON_NONE: /* Timeout */ |
854 | update(); | 859 | if (update()) |
860 | return 0; | ||
855 | break; | 861 | break; |
856 | } | 862 | } |
857 | 863 | ||
@@ -860,7 +866,8 @@ int wps_show(void) | |||
860 | 866 | ||
861 | if (restore) { | 867 | if (restore) { |
862 | restore = false; | 868 | restore = false; |
863 | wps_display(id3); | 869 | if (wps_display(id3)) |
870 | return 0; | ||
864 | if (id3) | 871 | if (id3) |
865 | wps_refresh(id3,0,false); | 872 | wps_refresh(id3,0,false); |
866 | } | 873 | } |