diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/wps.c | 60 |
1 files changed, 21 insertions, 39 deletions
diff --git a/apps/wps.c b/apps/wps.c index 46846cd3e1..7d1fcf4470 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -480,6 +480,8 @@ int wps_show(void) | |||
480 | 480 | ||
481 | while ( 1 ) | 481 | while ( 1 ) |
482 | { | 482 | { |
483 | bool restore = false; | ||
484 | |||
483 | button = button_get_w_tmo(HZ/5); | 485 | button = button_get_w_tmo(HZ/5); |
484 | 486 | ||
485 | /* discard first event if it's a button release */ | 487 | /* discard first event if it's a button release */ |
@@ -503,9 +505,7 @@ int wps_show(void) | |||
503 | if (keys_locked) | 505 | if (keys_locked) |
504 | { | 506 | { |
505 | display_keylock_text(keys_locked); | 507 | display_keylock_text(keys_locked); |
506 | draw_screen(id3); | 508 | restore = true; |
507 | if (mpeg_is_playing() && id3) | ||
508 | display_file_time(id3->elapsed, id3->length); | ||
509 | break; | 509 | break; |
510 | } | 510 | } |
511 | 511 | ||
@@ -520,9 +520,7 @@ int wps_show(void) | |||
520 | if (keys_locked) | 520 | if (keys_locked) |
521 | { | 521 | { |
522 | display_keylock_text(keys_locked); | 522 | display_keylock_text(keys_locked); |
523 | draw_screen(id3); | 523 | restore = true; |
524 | if (mpeg_is_playing() && id3) | ||
525 | display_file_time(id3->elapsed, id3->length); | ||
526 | break; | 524 | break; |
527 | } | 525 | } |
528 | 526 | ||
@@ -556,9 +554,7 @@ int wps_show(void) | |||
556 | if (keys_locked) | 554 | if (keys_locked) |
557 | { | 555 | { |
558 | display_keylock_text(keys_locked); | 556 | display_keylock_text(keys_locked); |
559 | draw_screen(id3); | 557 | restore = true; |
560 | if (mpeg_is_playing() && id3) | ||
561 | display_file_time(id3->elapsed, id3->length); | ||
562 | break; | 558 | break; |
563 | } | 559 | } |
564 | 560 | ||
@@ -578,9 +574,7 @@ int wps_show(void) | |||
578 | if (keys_locked) | 574 | if (keys_locked) |
579 | { | 575 | { |
580 | display_keylock_text(keys_locked); | 576 | display_keylock_text(keys_locked); |
581 | draw_screen(id3); | 577 | restore = true; |
582 | if (mpeg_is_playing() && id3) | ||
583 | display_file_time(id3->elapsed, id3->length); | ||
584 | break; | 578 | break; |
585 | } | 579 | } |
586 | 580 | ||
@@ -692,9 +686,7 @@ int wps_show(void) | |||
692 | #endif | 686 | #endif |
693 | { | 687 | { |
694 | display_keylock_text(keys_locked); | 688 | display_keylock_text(keys_locked); |
695 | draw_screen(id3); | 689 | restore = true; |
696 | if (mpeg_is_playing() && id3) | ||
697 | display_file_time(id3->elapsed, id3->length); | ||
698 | } | 690 | } |
699 | break; | 691 | break; |
700 | 692 | ||
@@ -734,9 +726,7 @@ int wps_show(void) | |||
734 | #endif | 726 | #endif |
735 | { | 727 | { |
736 | display_keylock_text(keys_locked); | 728 | display_keylock_text(keys_locked); |
737 | draw_screen(id3); | 729 | restore = true; |
738 | if (mpeg_is_playing() && id3) | ||
739 | display_file_time(id3->elapsed, id3->length); | ||
740 | break; | 730 | break; |
741 | } | 731 | } |
742 | break; | 732 | break; |
@@ -772,9 +762,7 @@ int wps_show(void) | |||
772 | if (keys_locked) | 762 | if (keys_locked) |
773 | { | 763 | { |
774 | display_keylock_text(keys_locked); | 764 | display_keylock_text(keys_locked); |
775 | draw_screen(id3); | 765 | restore = true; |
776 | if (mpeg_is_playing() && id3) | ||
777 | display_file_time(id3->elapsed, id3->length); | ||
778 | break; | 766 | break; |
779 | } | 767 | } |
780 | lcd_stop_scroll(); | 768 | lcd_stop_scroll(); |
@@ -843,9 +831,7 @@ int wps_show(void) | |||
843 | if(keys_locked) | 831 | if(keys_locked) |
844 | { | 832 | { |
845 | display_keylock_text(keys_locked); | 833 | display_keylock_text(keys_locked); |
846 | draw_screen(id3); | 834 | restore = true; |
847 | if (mpeg_is_playing() && id3) | ||
848 | display_file_time(id3->elapsed, id3->length); | ||
849 | break; | 835 | break; |
850 | } | 836 | } |
851 | 837 | ||
@@ -858,9 +844,7 @@ int wps_show(void) | |||
858 | else | 844 | else |
859 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 845 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
860 | display_mute_text(device_muted); | 846 | display_mute_text(device_muted); |
861 | if (mpeg_is_playing() && id3) | 847 | restore = true; |
862 | display_file_time(id3->elapsed, id3->length); | ||
863 | draw_screen(id3); | ||
864 | } | 848 | } |
865 | dont_go_to_menu = true; | 849 | dont_go_to_menu = true; |
866 | break; | 850 | break; |
@@ -881,9 +865,7 @@ int wps_show(void) | |||
881 | lcd_icon(ICON_RECORD, false); | 865 | lcd_icon(ICON_RECORD, false); |
882 | #endif | 866 | #endif |
883 | display_keylock_text(keys_locked); | 867 | display_keylock_text(keys_locked); |
884 | draw_screen(id3); | 868 | restore = true; |
885 | if (mpeg_is_playing() && id3) | ||
886 | display_file_time(id3->elapsed, id3->length); | ||
887 | } | 869 | } |
888 | 870 | ||
889 | dont_go_to_menu = true; | 871 | dont_go_to_menu = true; |
@@ -905,9 +887,7 @@ int wps_show(void) | |||
905 | old_release_mask = button_set_release(RELEASE_MASK); | 887 | old_release_mask = button_set_release(RELEASE_MASK); |
906 | ignore_keyup = true; | 888 | ignore_keyup = true; |
907 | id3 = mpeg_current_track(); | 889 | id3 = mpeg_current_track(); |
908 | draw_screen(id3); | 890 | restore = true; |
909 | if (mpeg_is_playing() && id3) | ||
910 | display_file_time(id3->elapsed, id3->length); | ||
911 | } | 891 | } |
912 | else | 892 | else |
913 | { | 893 | { |
@@ -928,9 +908,7 @@ int wps_show(void) | |||
928 | lcd_setmargins(0, STATUSBAR_HEIGHT); | 908 | lcd_setmargins(0, STATUSBAR_HEIGHT); |
929 | else | 909 | else |
930 | lcd_setmargins(0, 0); | 910 | lcd_setmargins(0, 0); |
931 | draw_screen(id3); | 911 | restore = true; |
932 | if (mpeg_is_playing() && id3) | ||
933 | display_file_time(id3->elapsed, id3->length); | ||
934 | #endif | 912 | #endif |
935 | break; | 913 | break; |
936 | #endif | 914 | #endif |
@@ -943,9 +921,7 @@ int wps_show(void) | |||
943 | if (keys_locked) | 921 | if (keys_locked) |
944 | { | 922 | { |
945 | display_keylock_text(keys_locked); | 923 | display_keylock_text(keys_locked); |
946 | draw_screen(id3); | 924 | restore = true; |
947 | if (mpeg_is_playing() && id3) | ||
948 | display_file_time(id3->elapsed, id3->length); | ||
949 | break; | 925 | break; |
950 | } | 926 | } |
951 | 927 | ||
@@ -995,5 +971,11 @@ int wps_show(void) | |||
995 | status_draw(); | 971 | status_draw(); |
996 | break; | 972 | break; |
997 | } | 973 | } |
974 | |||
975 | if(restore) { | ||
976 | draw_screen(id3); | ||
977 | if (mpeg_is_playing() && id3) | ||
978 | display_file_time(id3->elapsed, id3->length); | ||
979 | } | ||
998 | } | 980 | } |
999 | } | 981 | } |