diff options
author | Hristo Kovachev <bger@rockbox.org> | 2006-02-22 11:48:58 +0000 |
---|---|---|
committer | Hristo Kovachev <bger@rockbox.org> | 2006-02-22 11:48:58 +0000 |
commit | b12bcecb297ab8408b25bc9e539d78fa92e6589e (patch) | |
tree | ff74f9485c4f403d788382bd19107ec159ac9a56 /apps/tree.h | |
parent | d330ef7386fc289ef90aefb89962a5ac880226ae (diff) | |
download | rockbox-b12bcecb297ab8408b25bc9e539d78fa92e6589e.tar.gz rockbox-b12bcecb297ab8408b25bc9e539d78fa92e6589e.zip |
Remove some unused/deprecated defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8777 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.h')
-rw-r--r-- | apps/tree.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/apps/tree.h b/apps/tree.h index 8fdcc883cf..d1b57d6991 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -23,12 +23,8 @@ | |||
23 | #include <applimits.h> | 23 | #include <applimits.h> |
24 | #include <file.h> | 24 | #include <file.h> |
25 | 25 | ||
26 | /*FIXME: don't forget to remove PGUP, PGDOW, NEXT, PREV | ||
27 | * when everything will be working with gui_list */ | ||
28 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 26 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
29 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 27 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
30 | #define TREE_NEXT BUTTON_DOWN | ||
31 | #define TREE_PREV BUTTON_UP | ||
32 | #define TREE_EXIT BUTTON_LEFT | 28 | #define TREE_EXIT BUTTON_LEFT |
33 | #define TREE_ABORT BUTTON_OFF | 29 | #define TREE_ABORT BUTTON_OFF |
34 | #define TREE_ENTER BUTTON_RIGHT | 30 | #define TREE_ENTER BUTTON_RIGHT |
@@ -39,8 +35,6 @@ | |||
39 | #define TREE_OFF BUTTON_OFF | 35 | #define TREE_OFF BUTTON_OFF |
40 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) | 36 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) |
41 | #define TREE_WPS_PRE BUTTON_ON | 37 | #define TREE_WPS_PRE BUTTON_ON |
42 | #define TREE_PGUP (BUTTON_ON | BUTTON_UP) | ||
43 | #define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) | ||
44 | #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | 38 | #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) |
45 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) | 39 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) |
46 | #define TREE_POWER_BTN BUTTON_ON | 40 | #define TREE_POWER_BTN BUTTON_ON |
@@ -62,8 +56,6 @@ | |||
62 | #define TREE_RC_QUICK (BUTTON_RC_MODE | BUTTON_REPEAT) | 56 | #define TREE_RC_QUICK (BUTTON_RC_MODE | BUTTON_REPEAT) |
63 | 57 | ||
64 | #elif CONFIG_KEYPAD == RECORDER_PAD | 58 | #elif CONFIG_KEYPAD == RECORDER_PAD |
65 | #define TREE_NEXT BUTTON_DOWN | ||
66 | #define TREE_PREV BUTTON_UP | ||
67 | #define TREE_EXIT BUTTON_LEFT | 59 | #define TREE_EXIT BUTTON_LEFT |
68 | #define TREE_ABORT BUTTON_OFF | 60 | #define TREE_ABORT BUTTON_OFF |
69 | #define TREE_ENTER BUTTON_RIGHT | 61 | #define TREE_ENTER BUTTON_RIGHT |
@@ -73,8 +65,6 @@ | |||
73 | #define TREE_OFF BUTTON_OFF | 65 | #define TREE_OFF BUTTON_OFF |
74 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) | 66 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) |
75 | #define TREE_WPS_PRE BUTTON_ON | 67 | #define TREE_WPS_PRE BUTTON_ON |
76 | #define TREE_PGUP (BUTTON_ON | BUTTON_UP) | ||
77 | #define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) | ||
78 | #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) | 68 | #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) |
79 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) | 69 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) |
80 | #define TREE_POWER_BTN BUTTON_ON | 70 | #define TREE_POWER_BTN BUTTON_ON |
@@ -86,8 +76,6 @@ | |||
86 | #define TREE_RC_RUN BUTTON_RC_PLAY | 76 | #define TREE_RC_RUN BUTTON_RC_PLAY |
87 | 77 | ||
88 | #elif CONFIG_KEYPAD == PLAYER_PAD | 78 | #elif CONFIG_KEYPAD == PLAYER_PAD |
89 | #define TREE_NEXT BUTTON_RIGHT | ||
90 | #define TREE_PREV BUTTON_LEFT | ||
91 | #define TREE_EXIT BUTTON_STOP | 79 | #define TREE_EXIT BUTTON_STOP |
92 | #define TREE_ABORT BUTTON_STOP | 80 | #define TREE_ABORT BUTTON_STOP |
93 | #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) | 81 | #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) |
@@ -105,8 +93,6 @@ | |||
105 | #define TREE_RC_RUN BUTTON_RC_PLAY | 93 | #define TREE_RC_RUN BUTTON_RC_PLAY |
106 | 94 | ||
107 | #elif CONFIG_KEYPAD == ONDIO_PAD | 95 | #elif CONFIG_KEYPAD == ONDIO_PAD |
108 | #define TREE_NEXT BUTTON_DOWN | ||
109 | #define TREE_PREV BUTTON_UP | ||
110 | #define TREE_EXIT BUTTON_LEFT | 96 | #define TREE_EXIT BUTTON_LEFT |
111 | #define TREE_ABORT BUTTON_OFF | 97 | #define TREE_ABORT BUTTON_OFF |
112 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) | 98 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) |
@@ -120,8 +106,6 @@ | |||
120 | #define TREE_POWER_BTN BUTTON_OFF | 106 | #define TREE_POWER_BTN BUTTON_OFF |
121 | 107 | ||
122 | #elif CONFIG_KEYPAD == GMINI100_PAD | 108 | #elif CONFIG_KEYPAD == GMINI100_PAD |
123 | #define TREE_NEXT BUTTON_DOWN | ||
124 | #define TREE_PREV BUTTON_UP | ||
125 | #define TREE_EXIT BUTTON_LEFT | 109 | #define TREE_EXIT BUTTON_LEFT |
126 | #define TREE_ENTER BUTTON_RIGHT | 110 | #define TREE_ENTER BUTTON_RIGHT |
127 | #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) | 111 | #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) |
@@ -129,16 +113,12 @@ | |||
129 | #define TREE_MENU BUTTON_MENU | 113 | #define TREE_MENU BUTTON_MENU |
130 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) | 114 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) |
131 | #define TREE_WPS_PRE BUTTON_ON | 115 | #define TREE_WPS_PRE BUTTON_ON |
132 | #define TREE_PGUP (BUTTON_ON | BUTTON_UP) | ||
133 | #define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) | ||
134 | #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) | 116 | #define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT) |
135 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) | 117 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) |
136 | #define TREE_POWER_BTN BUTTON_ON | 118 | #define TREE_POWER_BTN BUTTON_ON |
137 | 119 | ||
138 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 120 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
139 | 121 | ||
140 | #define TREE_NEXT BUTTON_SCROLL_FWD | ||
141 | #define TREE_PREV BUTTON_SCROLL_BACK | ||
142 | #define TREE_EXIT BUTTON_LEFT | 122 | #define TREE_EXIT BUTTON_LEFT |
143 | #define TREE_ABORT BUTTON_LEFT | 123 | #define TREE_ABORT BUTTON_LEFT |
144 | #define TREE_ENTER BUTTON_RIGHT | 124 | #define TREE_ENTER BUTTON_RIGHT |
@@ -152,8 +132,6 @@ | |||
152 | 132 | ||
153 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 133 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
154 | 134 | ||
155 | #define TREE_NEXT BUTTON_DOWN | ||
156 | #define TREE_PREV BUTTON_UP | ||
157 | #define TREE_EXIT BUTTON_LEFT | 135 | #define TREE_EXIT BUTTON_LEFT |
158 | #define TREE_ABORT BUTTON_PLAY | 136 | #define TREE_ABORT BUTTON_PLAY |
159 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) | 137 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) |
@@ -167,8 +145,6 @@ | |||
167 | 145 | ||
168 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 146 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD |
169 | 147 | ||
170 | #define TREE_NEXT BUTTON_DOWN | ||
171 | #define TREE_PREV BUTTON_UP | ||
172 | #define TREE_EXIT BUTTON_LEFT | 148 | #define TREE_EXIT BUTTON_LEFT |
173 | #define TREE_ABORT BUTTON_PLAY | 149 | #define TREE_ABORT BUTTON_PLAY |
174 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) | 150 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) |