diff options
-rw-r--r-- | apps/wps.c | 83 |
1 files changed, 53 insertions, 30 deletions
diff --git a/apps/wps.c b/apps/wps.c index 72c4b5c993..240bc96f07 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -569,52 +569,73 @@ int wps_show(void) | |||
569 | break; | 569 | break; |
570 | 570 | ||
571 | case BUTTON_LEFT | BUTTON_REL: | 571 | case BUTTON_LEFT | BUTTON_REL: |
572 | if (ff_rewind) | 572 | if (!keys_locked) |
573 | { | 573 | { |
574 | /* rewind */ | 574 | if (ff_rewind) |
575 | mpeg_ff_rewind(ff_rewind_count); | 575 | { |
576 | ff_rewind_count = 0; | 576 | /* rewind */ |
577 | ff_rewind = false; | 577 | mpeg_ff_rewind(ff_rewind_count); |
578 | status_set_playmode(STATUS_PLAY); | 578 | ff_rewind_count = 0; |
579 | ff_rewind = false; | ||
580 | status_set_playmode(STATUS_PLAY); | ||
579 | #ifdef HAVE_LCD_CHARCELLS | 581 | #ifdef HAVE_LCD_CHARCELLS |
580 | draw_screen(id3); | 582 | draw_screen(id3); |
581 | #endif | 583 | #endif |
584 | } | ||
585 | #ifdef HAVE_PLAYER_KEYPAD | ||
586 | else if(!menu_button_is_down) | ||
587 | #else | ||
588 | else | ||
589 | #endif | ||
590 | { | ||
591 | mpeg_prev(); | ||
592 | status_set_playmode(STATUS_PLAY); | ||
593 | } | ||
582 | } | 594 | } |
595 | #ifdef HAVE_PLAYER_KEYPAD | ||
596 | else if(!menu_button_is_down) | ||
597 | #else | ||
583 | else | 598 | else |
599 | #endif | ||
584 | { | 600 | { |
585 | if (keys_locked) | 601 | display_keylock_text(keys_locked); |
586 | { | 602 | draw_screen(id3); |
587 | display_keylock_text(keys_locked); | ||
588 | draw_screen(id3); | ||
589 | break; | ||
590 | } | ||
591 | mpeg_prev(); | ||
592 | status_set_playmode(STATUS_PLAY); | ||
593 | } | 603 | } |
594 | break; | 604 | break; |
595 | 605 | ||
596 | case BUTTON_RIGHT | BUTTON_REL: | 606 | case BUTTON_RIGHT | BUTTON_REL: |
597 | if (ff_rewind) | 607 | if (!keys_locked) |
598 | { | 608 | { |
599 | /* fast forward */ | 609 | if (ff_rewind) |
600 | mpeg_ff_rewind(ff_rewind_count); | 610 | { |
601 | ff_rewind_count = 0; | 611 | /* fast forward */ |
602 | ff_rewind = false; | 612 | mpeg_ff_rewind(ff_rewind_count); |
603 | status_set_playmode(STATUS_PLAY); | 613 | ff_rewind_count = 0; |
614 | ff_rewind = false; | ||
615 | status_set_playmode(STATUS_PLAY); | ||
604 | #ifdef HAVE_LCD_CHARCELLS | 616 | #ifdef HAVE_LCD_CHARCELLS |
605 | draw_screen(id3); | 617 | draw_screen(id3); |
618 | #endif | ||
619 | } | ||
620 | #ifdef HAVE_PLAYER_KEYPAD | ||
621 | else if(!menu_button_is_down) | ||
622 | #else | ||
623 | else | ||
606 | #endif | 624 | #endif |
625 | { | ||
626 | mpeg_next(); | ||
627 | status_set_playmode(STATUS_PLAY); | ||
628 | } | ||
607 | } | 629 | } |
630 | #ifdef HAVE_PLAYER_KEYPAD | ||
631 | else if(!menu_button_is_down) | ||
632 | #else | ||
608 | else | 633 | else |
634 | #endif | ||
609 | { | 635 | { |
610 | if (keys_locked) | 636 | display_keylock_text(keys_locked); |
611 | { | 637 | draw_screen(id3); |
612 | display_keylock_text(keys_locked); | 638 | break; |
613 | draw_screen(id3); | ||
614 | break; | ||
615 | } | ||
616 | mpeg_next(); | ||
617 | status_set_playmode(STATUS_PLAY); | ||
618 | } | 639 | } |
619 | break; | 640 | break; |
620 | 641 | ||
@@ -626,6 +647,7 @@ int wps_show(void) | |||
626 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 647 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
627 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 648 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
628 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 649 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
650 | status_draw(); | ||
629 | settings_save(); | 651 | settings_save(); |
630 | break; | 652 | break; |
631 | 653 | ||
@@ -636,6 +658,7 @@ int wps_show(void) | |||
636 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 658 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
637 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 659 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
638 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 660 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
661 | status_draw(); | ||
639 | settings_save(); | 662 | settings_save(); |
640 | break; | 663 | break; |
641 | 664 | ||