diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 08:14:41 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 08:14:41 +0000 |
| commit | 881a5b97591c4db883c681bc71b2a0565873cbc3 (patch) | |
| tree | 583f453ed3b23b9f3352fedb2cbd2ba6a6f15ff4 /apps/settings_list.c | |
| parent | ceddd2f1e87fd884d9a9af59b20e47353085dff5 (diff) | |
| download | rockbox-881a5b97591c4db883c681bc71b2a0565873cbc3.zip rockbox-881a5b97591c4db883c681bc71b2a0565873cbc3.tar.gz rockbox-881a5b97591c4db883c681bc71b2a0565873cbc3.tar.bz2 rockbox-881a5b97591c4db883c681bc71b2a0565873cbc3.tar.xz | |
reclaim most of the delta from the pictureflow commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26715 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
| -rw-r--r-- | apps/settings_list.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 56107e7..391bb47 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1563,33 +1563,33 @@ const struct settings_list settings[] = { CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, "start in screen", "previous,root,files," #ifdef HAVE_TAGCACHE +#define START_DB_COUNT 1 "db," +#else +#define START_DB_COUNT 0 #endif "wps,menu," #ifdef HAVE_RECORDING +#define START_REC_COUNT 1 "recording," +#else +#define START_REC_COUNT 0 #endif #if CONFIG_TUNER +#define START_TUNER_COUNT 1 "radio," +#else +#define START_TUNER_COUNT 0 #endif - "bookmarks,pictureflow", NULL, -#if defined(HAVE_TAGCACHE) - #if defined(HAVE_RECORDING) && CONFIG_TUNER - 10, - #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ - 9, - #else - 8, - #endif -#else - #if defined(HAVE_RECORDING) && CONFIG_TUNER - 9, - #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ - 8, - #else - 7, - #endif + "bookmarks" +#ifdef HAVE_PICTUREFLOW +#define START_PF_COUNT 1 + ",pictureflow" +#else +#define START_PF_COUNT 0 #endif + , NULL, + (6 + START_DB_COUNT + START_REC_COUNT + START_TUNER_COUNT + START_PF_COUNT), ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), ID2P(LANG_DIR_BROWSER), #ifdef HAVE_TAGCACHE @@ -1602,8 +1602,10 @@ const struct settings_list settings[] = { #if CONFIG_TUNER ID2P(LANG_FM_RADIO), #endif - ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), - ID2P(LANG_ONPLAY_PICTUREFLOW) + ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) +#ifdef HAVE_PICTUREFLOW + ,ID2P(LANG_ONPLAY_PICTUREFLOW) +#endif ), SYSTEM_SETTING(NVRAM(1),last_screen,-1), #if defined(HAVE_RTC_ALARM) && \ |