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.tar.gz rockbox-881a5b97591c4db883c681bc71b2a0565873cbc3.zip |
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 56107e7b04..391bb47ffc 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1563,33 +1563,33 @@ const struct settings_list settings[] = { | |||
1563 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, | 1563 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, |
1564 | "start in screen", "previous,root,files," | 1564 | "start in screen", "previous,root,files," |
1565 | #ifdef HAVE_TAGCACHE | 1565 | #ifdef HAVE_TAGCACHE |
1566 | #define START_DB_COUNT 1 | ||
1566 | "db," | 1567 | "db," |
1568 | #else | ||
1569 | #define START_DB_COUNT 0 | ||
1567 | #endif | 1570 | #endif |
1568 | "wps,menu," | 1571 | "wps,menu," |
1569 | #ifdef HAVE_RECORDING | 1572 | #ifdef HAVE_RECORDING |
1573 | #define START_REC_COUNT 1 | ||
1570 | "recording," | 1574 | "recording," |
1575 | #else | ||
1576 | #define START_REC_COUNT 0 | ||
1571 | #endif | 1577 | #endif |
1572 | #if CONFIG_TUNER | 1578 | #if CONFIG_TUNER |
1579 | #define START_TUNER_COUNT 1 | ||
1573 | "radio," | 1580 | "radio," |
1581 | #else | ||
1582 | #define START_TUNER_COUNT 0 | ||
1574 | #endif | 1583 | #endif |
1575 | "bookmarks,pictureflow", NULL, | 1584 | "bookmarks" |
1576 | #if defined(HAVE_TAGCACHE) | 1585 | #ifdef HAVE_PICTUREFLOW |
1577 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | 1586 | #define START_PF_COUNT 1 |
1578 | 10, | 1587 | ",pictureflow" |
1579 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | 1588 | #else |
1580 | 9, | 1589 | #define START_PF_COUNT 0 |
1581 | #else | ||
1582 | 8, | ||
1583 | #endif | ||
1584 | #else | ||
1585 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | ||
1586 | 9, | ||
1587 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | ||
1588 | 8, | ||
1589 | #else | ||
1590 | 7, | ||
1591 | #endif | ||
1592 | #endif | 1590 | #endif |
1591 | , NULL, | ||
1592 | (6 + START_DB_COUNT + START_REC_COUNT + START_TUNER_COUNT + START_PF_COUNT), | ||
1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), | 1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), |
1594 | ID2P(LANG_DIR_BROWSER), | 1594 | ID2P(LANG_DIR_BROWSER), |
1595 | #ifdef HAVE_TAGCACHE | 1595 | #ifdef HAVE_TAGCACHE |
@@ -1602,8 +1602,10 @@ const struct settings_list settings[] = { | |||
1602 | #if CONFIG_TUNER | 1602 | #if CONFIG_TUNER |
1603 | ID2P(LANG_FM_RADIO), | 1603 | ID2P(LANG_FM_RADIO), |
1604 | #endif | 1604 | #endif |
1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), | 1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) |
1606 | ID2P(LANG_ONPLAY_PICTUREFLOW) | 1606 | #ifdef HAVE_PICTUREFLOW |
1607 | ,ID2P(LANG_ONPLAY_PICTUREFLOW) | ||
1608 | #endif | ||
1607 | ), | 1609 | ), |
1608 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), | 1610 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), |
1609 | #if defined(HAVE_RTC_ALARM) && \ | 1611 | #if defined(HAVE_RTC_ALARM) && \ |