diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 07:03:15 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 07:03:15 +0000 |
commit | d12f81ddd4a0cdd76d08540b70068b3cb2c985ed (patch) | |
tree | b821bfb025155f3c631920333549543622db3548 /apps/eq_menu.c | |
parent | c8e69dfb71d936b4bc5e18f6246ac126c629f772 (diff) | |
download | rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.tar.gz rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.zip |
fixed the settings action context, time/eq/colour chooser/dbug screens
should all work correctly again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10670 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/eq_menu.c')
-rw-r--r-- | apps/eq_menu.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/apps/eq_menu.c b/apps/eq_menu.c index 7c8b1590c3..0743490723 100644 --- a/apps/eq_menu.c +++ b/apps/eq_menu.c | |||
@@ -619,7 +619,7 @@ bool eq_menu_graphical(void) | |||
619 | screens[i].update(); | 619 | screens[i].update(); |
620 | } | 620 | } |
621 | 621 | ||
622 | button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); | 622 | button = get_action(CONTEXT_SETTINGS_EQ,TIMEOUT_BLOCK); |
623 | 623 | ||
624 | switch (button) { | 624 | switch (button) { |
625 | case ACTION_SETTINGS_DEC: | 625 | case ACTION_SETTINGS_DEC: |
@@ -638,23 +638,19 @@ bool eq_menu_graphical(void) | |||
638 | *(setting) = max; | 638 | *(setting) = max; |
639 | break; | 639 | break; |
640 | 640 | ||
641 | #ifdef EQ_BTN_MODIFIER | 641 | case ACTION_SETTINGS_INCBIGSTEP: |
642 | case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT: | ||
643 | case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT | BUTTON_REPEAT: | ||
644 | *(setting) += fast_step; | 642 | *(setting) += fast_step; |
645 | has_changed = true; | 643 | has_changed = true; |
646 | if (*(setting) > max) | 644 | if (*(setting) > max) |
647 | *(setting) = max; | 645 | *(setting) = max; |
648 | break; | 646 | break; |
649 | 647 | ||
650 | case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT: | 648 | case ACTION_SETTINGS_DECBIGSTEP: |
651 | case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT | BUTTON_REPEAT: | ||
652 | *(setting) -= fast_step; | 649 | *(setting) -= fast_step; |
653 | has_changed = true; | 650 | has_changed = true; |
654 | if (*(setting) < min) | 651 | if (*(setting) < min) |
655 | *(setting) = min; | 652 | *(setting) = min; |
656 | break; | 653 | break; |
657 | #endif | ||
658 | 654 | ||
659 | case ACTION_STD_PREV: | 655 | case ACTION_STD_PREV: |
660 | case ACTION_STD_PREVREPEAT: | 656 | case ACTION_STD_PREVREPEAT: |
@@ -670,13 +666,13 @@ bool eq_menu_graphical(void) | |||
670 | current_band = 0; /* wrap around */ | 666 | current_band = 0; /* wrap around */ |
671 | break; | 667 | break; |
672 | 668 | ||
673 | case ACTION_STD_OK: | 669 | case ACTION_STD_OK: |
674 | mode++; | 670 | mode++; |
675 | if (mode > Q) | 671 | if (mode > Q) |
676 | mode = GAIN; /* wrap around */ | 672 | mode = GAIN; /* wrap around */ |
677 | break; | 673 | break; |
678 | 674 | ||
679 | case ACTION_STD_CANCEL: | 675 | case ACTION_STD_CANCEL: |
680 | exit_request = true; | 676 | exit_request = true; |
681 | result = false; | 677 | result = false; |
682 | break; | 678 | break; |