diff options
-rw-r--r-- | apps/features.txt | 109 | ||||
-rw-r--r-- | manual/configure_rockbox/playback_options.tex | 3 | ||||
-rw-r--r-- | manual/rockbox_interface/wps.tex | 6 |
3 files changed, 63 insertions, 55 deletions
diff --git a/apps/features.txt b/apps/features.txt index ef866a9eb1..6ca8d0894b 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -16,20 +16,10 @@ agc | |||
16 | alarm | 16 | alarm |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #if defined(HAVE_ALBUMART) | ||
20 | albumart | ||
21 | #endif | ||
22 | |||
23 | #if defined(HAVE_BACKLIGHT_BRIGHTNESS) | 19 | #if defined(HAVE_BACKLIGHT_BRIGHTNESS) |
24 | backlight_brightness | 20 | backlight_brightness |
25 | #endif | 21 | #endif |
26 | 22 | ||
27 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | ||
28 | backlight_fade_int | ||
29 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) | ||
30 | backlight_fade_bool | ||
31 | #endif | ||
32 | |||
33 | #if BATTERY_TYPES_COUNT > 1 | 23 | #if BATTERY_TYPES_COUNT > 1 |
34 | battery_types | 24 | battery_types |
35 | #endif | 25 | #endif |
@@ -54,10 +44,6 @@ dircache | |||
54 | flash_storage | 44 | flash_storage |
55 | #endif | 45 | #endif |
56 | 46 | ||
57 | #if defined(HAVE_DISK_STORAGE) | ||
58 | disk_storage | ||
59 | #endif | ||
60 | |||
61 | #if defined(HAVE_HEADPHONE_DETECTION) | 47 | #if defined(HAVE_HEADPHONE_DETECTION) |
62 | headphone_detection | 48 | headphone_detection |
63 | #endif | 49 | #endif |
@@ -66,10 +52,6 @@ headphone_detection | |||
66 | hold_button | 52 | hold_button |
67 | #endif | 53 | #endif |
68 | 54 | ||
69 | #if defined(HAS_REMOTE_BUTTON_HOLD) | ||
70 | remote_button_hold | ||
71 | #endif | ||
72 | |||
73 | #if defined(HAVE_HOTKEY) | 55 | #if defined(HAVE_HOTKEY) |
74 | hotkey | 56 | hotkey |
75 | #endif | 57 | #endif |
@@ -78,10 +60,6 @@ hotkey | |||
78 | lcd_bitmap | 60 | lcd_bitmap |
79 | #endif | 61 | #endif |
80 | 62 | ||
81 | #if defined(HAVE_LCD_CHARCELLS) | ||
82 | lcd_charcell | ||
83 | #endif | ||
84 | |||
85 | #if LCD_DEPTH > 1 | 63 | #if LCD_DEPTH > 1 |
86 | lcd_non-mono | 64 | lcd_non-mono |
87 | #endif | 65 | #endif |
@@ -90,10 +68,6 @@ lcd_non-mono | |||
90 | lcd_color | 68 | lcd_color |
91 | #endif | 69 | #endif |
92 | 70 | ||
93 | #if defined(HAVE_LCD_FLIP) | ||
94 | lcd_flip | ||
95 | #endif | ||
96 | |||
97 | #if defined(HAVE_LCD_INVERT) | 71 | #if defined(HAVE_LCD_INVERT) |
98 | lcd_invert | 72 | lcd_invert |
99 | #endif | 73 | #endif |
@@ -102,10 +76,6 @@ lcd_invert | |||
102 | lcd_sleep | 76 | lcd_sleep |
103 | #endif | 77 | #endif |
104 | 78 | ||
105 | #if defined(HAVE_LCD_CONTRAST) | ||
106 | lcd_contrast | ||
107 | #endif | ||
108 | |||
109 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 79 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
110 | masf | 80 | masf |
111 | #endif | 81 | #endif |
@@ -176,10 +146,6 @@ remote_ticking | |||
176 | rtc | 146 | rtc |
177 | #endif | 147 | #endif |
178 | 148 | ||
179 | #if defined(HAVE_SCROLLWHEEL) | ||
180 | scrollwheel | ||
181 | #endif | ||
182 | |||
183 | #if defined(IPOD_ACCESSORY_PROTOCOL) | 149 | #if defined(IPOD_ACCESSORY_PROTOCOL) |
184 | serial_port | 150 | serial_port |
185 | #endif | 151 | #endif |
@@ -217,21 +183,6 @@ usb_charging_enable | |||
217 | #endif | 183 | #endif |
218 | #endif | 184 | #endif |
219 | 185 | ||
220 | #if defined(HAVE_USB_POWER) | ||
221 | usb_power | ||
222 | #endif | ||
223 | |||
224 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | ||
225 | usbstack | ||
226 | #endif | ||
227 | |||
228 | #if defined(USB_ENABLE_HID) | ||
229 | usb_hid | ||
230 | #if defined(HAVE_USB_HID_MOUSE) | ||
231 | usb_hid_mouse | ||
232 | #endif | ||
233 | #endif | ||
234 | |||
235 | #if defined(HAVE_WHEEL_ACCELERATION) | 186 | #if defined(HAVE_WHEEL_ACCELERATION) |
236 | wheel_acceleration | 187 | wheel_acceleration |
237 | #endif | 188 | #endif |
@@ -244,6 +195,66 @@ lineout_poweroff | |||
244 | touchscreen | 195 | touchscreen |
245 | #endif | 196 | #endif |
246 | 197 | ||
198 | |||
199 | |||
200 | |||
201 | /* These features are only used by the manual so they won't break binary | ||
202 | * compatibility | ||
203 | */ | ||
204 | |||
247 | #if (PLUGIN_BUFFER_SIZE >= 0x80000) | 205 | #if (PLUGIN_BUFFER_SIZE >= 0x80000) |
248 | large_plugin_buffer | 206 | large_plugin_buffer |
249 | #endif | 207 | #endif |
208 | |||
209 | #if defined(AB_REPEAT_ENABLE) && !defined(ACTION_WPSAB_SINGLE) | ||
210 | ab_repeat_buttons | ||
211 | #endif | ||
212 | |||
213 | #if defined(HAVE_ALBUMART) | ||
214 | albumart | ||
215 | #endif | ||
216 | |||
217 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | ||
218 | backlight_fade_int | ||
219 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) | ||
220 | backlight_fade_bool | ||
221 | #endif | ||
222 | |||
223 | #if defined(HAVE_DISK_STORAGE) | ||
224 | disk_storage | ||
225 | #endif | ||
226 | |||
227 | #if defined(HAS_REMOTE_BUTTON_HOLD) | ||
228 | remote_button_hold | ||
229 | #endif | ||
230 | |||
231 | #if defined(HAVE_LCD_CHARCELLS) | ||
232 | lcd_charcell | ||
233 | #endif | ||
234 | |||
235 | #if defined(HAVE_LCD_FLIP) | ||
236 | lcd_flip | ||
237 | #endif | ||
238 | |||
239 | #if defined(HAVE_LCD_CONTRAST) | ||
240 | lcd_contrast | ||
241 | #endif | ||
242 | |||
243 | #if defined(HAVE_SCROLLWHEEL) | ||
244 | scrollwheel | ||
245 | #endif | ||
246 | |||
247 | #if defined(HAVE_USB_POWER) | ||
248 | usb_power | ||
249 | #endif | ||
250 | |||
251 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | ||
252 | usbstack | ||
253 | #endif | ||
254 | |||
255 | #if defined(USB_ENABLE_HID) | ||
256 | usb_hid | ||
257 | #if defined(HAVE_USB_HID_MOUSE) | ||
258 | usb_hid_mouse | ||
259 | #endif | ||
260 | #endif | ||
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index 7d9c8baa09..727f8d334d 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex | |||
@@ -37,8 +37,7 @@ you to configure settings related to audio playback. | |||
37 | must first be placed into A-B repeat mode and then the start and end | 37 | must first be placed into A-B repeat mode and then the start and end |
38 | points defined.\\ | 38 | points defined.\\ |
39 | 39 | ||
40 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% | 40 | \opt{ab_repeat_buttons}{ |
41 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% | ||
42 | To set the Start Point (A) press \ActionWpsAbSetAPrevDir{}. | 41 | To set the Start Point (A) press \ActionWpsAbSetAPrevDir{}. |
43 | Setting the End Point (B) is done accordingly using | 42 | Setting the End Point (B) is done accordingly using |
44 | \ActionWpsAbSetBNextDir{}. To reset the markers press \ActionWpsAbReset{}. | 43 | \ActionWpsAbSetBNextDir{}. To reset the markers press \ActionWpsAbReset{}. |
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index cdfde8d3fc..a8063481a5 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex | |||
@@ -144,8 +144,7 @@ your WPS (While Playing Screen). | |||
144 | \ActionWpsHotkey \opt{HAVEREMOTEKEYMAP}{& } | 144 | \ActionWpsHotkey \opt{HAVEREMOTEKEYMAP}{& } |
145 | & Activate the \setting{Hotkey} function (see \reference{ref:Hotkeys}).\\ | 145 | & Activate the \setting{Hotkey} function (see \reference{ref:Hotkeys}).\\ |
146 | } | 146 | } |
147 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% | 147 | \opt{ab_repeat_buttons}{ |
148 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% | ||
149 | \ActionWpsAbSetBNextDir{} or }% | 148 | \ActionWpsAbSetBNextDir{} or }% |
150 | % not all targets have the above action defined but the one below works on all | 149 | % not all targets have the above action defined but the one below works on all |
151 | Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext | 150 | Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext |
@@ -155,8 +154,7 @@ your WPS (While Playing Screen). | |||
155 | Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext} | 154 | Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext} |
156 | & Skip to the next directory.\\ | 155 | & Skip to the next directory.\\ |
157 | % | 156 | % |
158 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD% | 157 | \opt{ab_repeat_buttons}{ |
159 | ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% | ||
160 | \ActionWpsAbSetAPrevDir{} or }% | 158 | \ActionWpsAbSetAPrevDir{} or }% |
161 | Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev | 159 | Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev |
162 | \opt{HAVEREMOTEKEYMAP}{ | 160 | \opt{HAVEREMOTEKEYMAP}{ |