From 45fc5e3aade9a47727b8caacf75958f9ee527167 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 18 Jul 2010 18:43:08 +0000 Subject: Add a 'ab_repeat_buttons' feature Use it in the manual instead of a built in list of models Sort all features which aren't used in apps/lang/* Fix FS#11379 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27485 a1c6a512-1295-4272-9138-f99709370657 --- apps/features.txt | 109 ++++++++++++++------------ manual/configure_rockbox/playback_options.tex | 3 +- 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 alarm #endif -#if defined(HAVE_ALBUMART) -albumart -#endif - #if defined(HAVE_BACKLIGHT_BRIGHTNESS) backlight_brightness #endif -#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) -backlight_fade_int -#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) -backlight_fade_bool -#endif - #if BATTERY_TYPES_COUNT > 1 battery_types #endif @@ -54,10 +44,6 @@ dircache flash_storage #endif -#if defined(HAVE_DISK_STORAGE) -disk_storage -#endif - #if defined(HAVE_HEADPHONE_DETECTION) headphone_detection #endif @@ -66,10 +52,6 @@ headphone_detection hold_button #endif -#if defined(HAS_REMOTE_BUTTON_HOLD) -remote_button_hold -#endif - #if defined(HAVE_HOTKEY) hotkey #endif @@ -78,10 +60,6 @@ hotkey lcd_bitmap #endif -#if defined(HAVE_LCD_CHARCELLS) -lcd_charcell -#endif - #if LCD_DEPTH > 1 lcd_non-mono #endif @@ -90,10 +68,6 @@ lcd_non-mono lcd_color #endif -#if defined(HAVE_LCD_FLIP) -lcd_flip -#endif - #if defined(HAVE_LCD_INVERT) lcd_invert #endif @@ -102,10 +76,6 @@ lcd_invert lcd_sleep #endif -#if defined(HAVE_LCD_CONTRAST) -lcd_contrast -#endif - #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) masf #endif @@ -176,10 +146,6 @@ remote_ticking rtc #endif -#if defined(HAVE_SCROLLWHEEL) -scrollwheel -#endif - #if defined(IPOD_ACCESSORY_PROTOCOL) serial_port #endif @@ -217,21 +183,6 @@ usb_charging_enable #endif #endif -#if defined(HAVE_USB_POWER) -usb_power -#endif - -#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) -usbstack -#endif - -#if defined(USB_ENABLE_HID) -usb_hid -#if defined(HAVE_USB_HID_MOUSE) -usb_hid_mouse -#endif -#endif - #if defined(HAVE_WHEEL_ACCELERATION) wheel_acceleration #endif @@ -244,6 +195,66 @@ lineout_poweroff touchscreen #endif + + + +/* These features are only used by the manual so they won't break binary + * compatibility + */ + #if (PLUGIN_BUFFER_SIZE >= 0x80000) large_plugin_buffer #endif + +#if defined(AB_REPEAT_ENABLE) && !defined(ACTION_WPSAB_SINGLE) +ab_repeat_buttons +#endif + +#if defined(HAVE_ALBUMART) +albumart +#endif + +#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) +backlight_fade_int +#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) +backlight_fade_bool +#endif + +#if defined(HAVE_DISK_STORAGE) +disk_storage +#endif + +#if defined(HAS_REMOTE_BUTTON_HOLD) +remote_button_hold +#endif + +#if defined(HAVE_LCD_CHARCELLS) +lcd_charcell +#endif + +#if defined(HAVE_LCD_FLIP) +lcd_flip +#endif + +#if defined(HAVE_LCD_CONTRAST) +lcd_contrast +#endif + +#if defined(HAVE_SCROLLWHEEL) +scrollwheel +#endif + +#if defined(HAVE_USB_POWER) +usb_power +#endif + +#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) +usbstack +#endif + +#if defined(USB_ENABLE_HID) +usb_hid +#if defined(HAVE_USB_HID_MOUSE) +usb_hid_mouse +#endif +#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. must first be placed into A-B repeat mode and then the start and end points defined.\\ - \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% - ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% + \opt{ab_repeat_buttons}{ To set the Start Point (A) press \ActionWpsAbSetAPrevDir{}. Setting the End Point (B) is done accordingly using \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). \ActionWpsHotkey \opt{HAVEREMOTEKEYMAP}{& } & Activate the \setting{Hotkey} function (see \reference{ref:Hotkeys}).\\ } - \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% - ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% + \opt{ab_repeat_buttons}{ \ActionWpsAbSetBNextDir{} or }% % not all targets have the above action defined but the one below works on all Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext @@ -155,8 +154,7 @@ your WPS (While Playing Screen). Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext} & Skip to the next directory.\\ % - \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD% - ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% + \opt{ab_repeat_buttons}{ \ActionWpsAbSetAPrevDir{} or }% Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev \opt{HAVEREMOTEKEYMAP}{ -- cgit v1.2.3