diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
commit | 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 (patch) | |
tree | bae2154b272f786983cf8e6de28d33f98f327560 /apps/eq_menu.c | |
parent | c0f8b187706364f5e4bda2ac26750d14454c901d (diff) | |
download | rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.tar.gz rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.zip |
Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/eq_menu.c')
-rw-r--r-- | apps/eq_menu.c | 118 |
1 files changed, 13 insertions, 105 deletions
diff --git a/apps/eq_menu.c b/apps/eq_menu.c index 32d16c47e1..7c8b1590c3 100644 --- a/apps/eq_menu.c +++ b/apps/eq_menu.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "kernel.h" | 26 | #include "kernel.h" |
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "menu.h" | 28 | #include "menu.h" |
29 | #include "button.h" | 29 | #include "action.h" |
30 | #include "mp3_playback.h" | 30 | #include "mp3_playback.h" |
31 | #include "settings.h" | 31 | #include "settings.h" |
32 | #include "statusbar.h" | 32 | #include "statusbar.h" |
@@ -49,73 +49,6 @@ | |||
49 | #include "wm8758.h" | 49 | #include "wm8758.h" |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | /* Key definitions */ | ||
53 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD || \ | ||
54 | CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
55 | |||
56 | #define EQ_BTN_MODIFIER BUTTON_ON | ||
57 | #define EQ_BTN_DECREMENT BUTTON_LEFT | ||
58 | #define EQ_BTN_INCREMENT BUTTON_RIGHT | ||
59 | #define EQ_BTN_NEXT_BAND BUTTON_DOWN | ||
60 | #define EQ_BTN_PREV_BAND BUTTON_UP | ||
61 | #define EQ_BTN_CHANGE_MODE BUTTON_SELECT | ||
62 | #define EQ_BTN_EXIT BUTTON_OFF | ||
63 | |||
64 | #define EQ_BTN_RC_PREV_BAND BUTTON_RC_REW | ||
65 | #define EQ_BTN_RC_NEXT_BAND BUTTON_RC_FF | ||
66 | #define EQ_BTN_RC_DECREMENT BUTTON_RC_SOURCE | ||
67 | #define EQ_BTN_RC_INCREMENT BUTTON_RC_BITRATE | ||
68 | #define EQ_BTN_RC_CHANGE_MODE BUTTON_RC_MENU | ||
69 | #define EQ_BTN_RC_EXIT BUTTON_RC_STOP | ||
70 | |||
71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | ||
72 | (CONFIG_KEYPAD == IPOD_3G_PAD) | ||
73 | |||
74 | #define EQ_BTN_DECREMENT BUTTON_SCROLL_BACK | ||
75 | #define EQ_BTN_INCREMENT BUTTON_SCROLL_FWD | ||
76 | #define EQ_BTN_NEXT_BAND BUTTON_RIGHT | ||
77 | #define EQ_BTN_PREV_BAND BUTTON_LEFT | ||
78 | #define EQ_BTN_CHANGE_MODE BUTTON_SELECT | ||
79 | #define EQ_BTN_EXIT BUTTON_MENU | ||
80 | |||
81 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | ||
82 | |||
83 | #define EQ_BTN_DECREMENT BUTTON_LEFT | ||
84 | #define EQ_BTN_INCREMENT BUTTON_RIGHT | ||
85 | #define EQ_BTN_NEXT_BAND BUTTON_DOWN | ||
86 | #define EQ_BTN_PREV_BAND BUTTON_UP | ||
87 | #define EQ_BTN_CHANGE_MODE BUTTON_REC | ||
88 | #define EQ_BTN_EXIT BUTTON_SELECT | ||
89 | |||
90 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | ||
91 | |||
92 | #define EQ_BTN_DECREMENT BUTTON_LEFT | ||
93 | #define EQ_BTN_INCREMENT BUTTON_RIGHT | ||
94 | #define EQ_BTN_NEXT_BAND BUTTON_DOWN | ||
95 | #define EQ_BTN_PREV_BAND BUTTON_UP | ||
96 | #define EQ_BTN_CHANGE_MODE BUTTON_SELECT | ||
97 | #define EQ_BTN_EXIT BUTTON_PLAY | ||
98 | |||
99 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
100 | |||
101 | #define EQ_BTN_DECREMENT BUTTON_LEFT | ||
102 | #define EQ_BTN_INCREMENT BUTTON_RIGHT | ||
103 | #define EQ_BTN_NEXT_BAND BUTTON_DOWN | ||
104 | #define EQ_BTN_PREV_BAND BUTTON_UP | ||
105 | #define EQ_BTN_CHANGE_MODE BUTTON_SELECT | ||
106 | #define EQ_BTN_EXIT BUTTON_A | ||
107 | |||
108 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | ||
109 | |||
110 | #define EQ_BTN_DECREMENT BUTTON_LEFT | ||
111 | #define EQ_BTN_INCREMENT BUTTON_RIGHT | ||
112 | #define EQ_BTN_NEXT_BAND BUTTON_SCROLL_DOWN | ||
113 | #define EQ_BTN_PREV_BAND BUTTON_SCROLL_UP | ||
114 | #define EQ_BTN_CHANGE_MODE BUTTON_PLAY | ||
115 | #define EQ_BTN_EXIT BUTTON_POWER | ||
116 | |||
117 | #endif | ||
118 | |||
119 | /* Various user interface limits and sizes */ | 52 | /* Various user interface limits and sizes */ |
120 | #define EQ_CUTOFF_MIN 20 | 53 | #define EQ_CUTOFF_MIN 20 |
121 | #define EQ_CUTOFF_MAX 22040 | 54 | #define EQ_CUTOFF_MAX 22040 |
@@ -686,27 +619,19 @@ bool eq_menu_graphical(void) | |||
686 | screens[i].update(); | 619 | screens[i].update(); |
687 | } | 620 | } |
688 | 621 | ||
689 | button = button_get(true); | 622 | button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); |
690 | 623 | ||
691 | switch (button) { | 624 | switch (button) { |
692 | case EQ_BTN_DECREMENT: | 625 | case ACTION_SETTINGS_DEC: |
693 | case EQ_BTN_DECREMENT | BUTTON_REPEAT: | 626 | case ACTION_SETTINGS_DECREPEAT: |
694 | #ifdef EQ_BTN_RC_DECREMENT | ||
695 | case EQ_BTN_RC_DECREMENT: | ||
696 | case EQ_BTN_RC_DECREMENT | BUTTON_REPEAT: | ||
697 | #endif | ||
698 | *(setting) -= step; | 627 | *(setting) -= step; |
699 | has_changed = true; | 628 | has_changed = true; |
700 | if (*(setting) < min) | 629 | if (*(setting) < min) |
701 | *(setting) = min; | 630 | *(setting) = min; |
702 | break; | 631 | break; |
703 | 632 | ||
704 | case EQ_BTN_INCREMENT: | 633 | case ACTION_SETTINGS_INC: |
705 | case EQ_BTN_INCREMENT | BUTTON_REPEAT: | 634 | case ACTION_SETTINGS_INCREPEAT: |
706 | #ifdef EQ_BTN_RC_INCREMENT | ||
707 | case EQ_BTN_RC_INCREMENT: | ||
708 | case EQ_BTN_RC_INCREMENT | BUTTON_REPEAT: | ||
709 | #endif | ||
710 | *(setting) += step; | 635 | *(setting) += step; |
711 | has_changed = true; | 636 | has_changed = true; |
712 | if (*(setting) > max) | 637 | if (*(setting) > max) |
@@ -731,45 +656,27 @@ bool eq_menu_graphical(void) | |||
731 | break; | 656 | break; |
732 | #endif | 657 | #endif |
733 | 658 | ||
734 | case EQ_BTN_PREV_BAND: | 659 | case ACTION_STD_PREV: |
735 | case EQ_BTN_PREV_BAND | BUTTON_REPEAT: | 660 | case ACTION_STD_PREVREPEAT: |
736 | #ifdef EQ_BTN_RC_PREV_BAND | ||
737 | case EQ_BTN_RC_PREV_BAND: | ||
738 | case EQ_BTN_RC_PREV_BAND | BUTTON_REPEAT: | ||
739 | #endif | ||
740 | current_band--; | 661 | current_band--; |
741 | if (current_band < 0) | 662 | if (current_band < 0) |
742 | current_band = 4; /* wrap around */ | 663 | current_band = 4; /* wrap around */ |
743 | break; | 664 | break; |
744 | 665 | ||
745 | case EQ_BTN_NEXT_BAND: | 666 | case ACTION_STD_NEXT: |
746 | case EQ_BTN_NEXT_BAND | BUTTON_REPEAT: | 667 | case ACTION_STD_NEXTREPEAT: |
747 | #ifdef EQ_BTN_RC_NEXT_BAND | ||
748 | case EQ_BTN_RC_NEXT_BAND: | ||
749 | case EQ_BTN_RC_NEXT_BAND | BUTTON_REPEAT: | ||
750 | #endif | ||
751 | current_band++; | 668 | current_band++; |
752 | if (current_band > 4) | 669 | if (current_band > 4) |
753 | current_band = 0; /* wrap around */ | 670 | current_band = 0; /* wrap around */ |
754 | break; | 671 | break; |
755 | 672 | ||
756 | case EQ_BTN_CHANGE_MODE: | 673 | case ACTION_STD_OK: |
757 | case EQ_BTN_CHANGE_MODE | BUTTON_REPEAT: | ||
758 | #ifdef EQ_BTN_RC_CHANGE_MODE | ||
759 | case EQ_BTN_RC_CHANGE_MODE: | ||
760 | case EQ_BTN_RC_CHANGE_MODE | BUTTON_REPEAT: | ||
761 | #endif | ||
762 | mode++; | 674 | mode++; |
763 | if (mode > Q) | 675 | if (mode > Q) |
764 | mode = GAIN; /* wrap around */ | 676 | mode = GAIN; /* wrap around */ |
765 | break; | 677 | break; |
766 | 678 | ||
767 | case EQ_BTN_EXIT: | 679 | case ACTION_STD_CANCEL: |
768 | case EQ_BTN_EXIT | BUTTON_REPEAT: | ||
769 | #ifdef EQ_BTN_RC_EXIT | ||
770 | case EQ_BTN_RC_EXIT: | ||
771 | case EQ_BTN_RC_EXIT | BUTTON_REPEAT: | ||
772 | #endif | ||
773 | exit_request = true; | 680 | exit_request = true; |
774 | result = false; | 681 | result = false; |
775 | break; | 682 | break; |
@@ -789,6 +696,7 @@ bool eq_menu_graphical(void) | |||
789 | } | 696 | } |
790 | } | 697 | } |
791 | 698 | ||
699 | action_signalscreenchange(); | ||
792 | /* Reset screen settings */ | 700 | /* Reset screen settings */ |
793 | FOR_NB_SCREENS(i) { | 701 | FOR_NB_SCREENS(i) { |
794 | screens[i].setfont(FONT_UI); | 702 | screens[i].setfont(FONT_UI); |