diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/wps.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/apps/wps.c b/apps/wps.c index 5d4bf1673b..3af73d15ed 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -385,7 +385,10 @@ void display_volume_level(int vol_level) | |||
385 | lcd_puts(0, 0, buffer); | 385 | lcd_puts(0, 0, buffer); |
386 | #else | 386 | #else |
387 | lcd_puts(2, 3, buffer); | 387 | lcd_puts(2, 3, buffer); |
388 | lcd_update(); | ||
388 | #endif | 389 | #endif |
390 | |||
391 | sleep(HZ/6); | ||
389 | } | 392 | } |
390 | 393 | ||
391 | void display_keylock_text(bool locked) | 394 | void display_keylock_text(bool locked) |
@@ -643,14 +646,13 @@ int wps_show(void) | |||
643 | break; | 646 | break; |
644 | 647 | ||
645 | case BUTTON_LEFT | BUTTON_REL: | 648 | case BUTTON_LEFT | BUTTON_REL: |
649 | if (menu_button_is_down && keys_locked) | ||
650 | { | ||
651 | sleep(HZ/6); | ||
652 | draw_screen(id3); | ||
653 | } | ||
646 | if (!keys_locked) | 654 | if (!keys_locked) |
647 | { | 655 | { |
648 | if (menu_button_is_down) | ||
649 | { | ||
650 | sleep(HZ/6); | ||
651 | draw_screen(id3); | ||
652 | } | ||
653 | |||
654 | if (ff_rewind) | 656 | if (ff_rewind) |
655 | { | 657 | { |
656 | /* rewind */ | 658 | /* rewind */ |
@@ -684,14 +686,13 @@ int wps_show(void) | |||
684 | break; | 686 | break; |
685 | 687 | ||
686 | case BUTTON_RIGHT | BUTTON_REL: | 688 | case BUTTON_RIGHT | BUTTON_REL: |
689 | if (menu_button_is_down && keys_locked) | ||
690 | { | ||
691 | sleep(HZ/6); | ||
692 | draw_screen(id3); | ||
693 | } | ||
687 | if (!keys_locked) | 694 | if (!keys_locked) |
688 | { | 695 | { |
689 | if (menu_button_is_down) | ||
690 | { | ||
691 | sleep(HZ/6); | ||
692 | draw_screen(id3); | ||
693 | } | ||
694 | |||
695 | if (ff_rewind) | 696 | if (ff_rewind) |
696 | { | 697 | { |
697 | /* fast forward */ | 698 | /* fast forward */ |
@@ -733,8 +734,8 @@ int wps_show(void) | |||
733 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 734 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
734 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 735 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
735 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 736 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
736 | display_volume_level(global_settings.volume); | 737 | display_volume_level(global_settings.volume); |
737 | 738 | draw_screen(id3); | |
738 | status_draw(); | 739 | status_draw(); |
739 | settings_save(); | 740 | settings_save(); |
740 | break; | 741 | break; |
@@ -746,8 +747,8 @@ int wps_show(void) | |||
746 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 747 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
747 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 748 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
748 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 749 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
749 | display_volume_level(global_settings.volume); | 750 | display_volume_level(global_settings.volume); |
750 | 751 | draw_screen(id3); | |
751 | status_draw(); | 752 | status_draw(); |
752 | settings_save(); | 753 | settings_save(); |
753 | break; | 754 | break; |
@@ -760,6 +761,8 @@ int wps_show(void) | |||
760 | break; | 761 | break; |
761 | } | 762 | } |
762 | lcd_stop_scroll(); | 763 | lcd_stop_scroll(); |
764 | dont_go_to_menu = true; | ||
765 | menu_button_is_down = false; | ||
763 | lcd_icon(ICON_PARAM, true); | 766 | lcd_icon(ICON_PARAM, true); |
764 | lcd_icon(ICON_AUDIO, true); | 767 | lcd_icon(ICON_AUDIO, true); |
765 | retval = player_id3_show(); | 768 | retval = player_id3_show(); |