summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-03-04 00:59:42 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-03-04 00:59:42 +0000
commit55843fdedd2781228a13d1da2032b9adf3eb943b (patch)
tree521b130369fc0cba98804dfc4acd430a2b7fbfc4 /apps/settings_list.c
parent94eef3fbee4aa178015d22f271acb343e2533acd (diff)
downloadrockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.zip
rockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.tar.gz
rockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.tar.bz2
rockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.tar.xz
Fix the start screen option - recording now works, and allow the
bookmarks to be chosen as a start screen git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12577 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 40a48ee..0777901 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1092,29 +1092,29 @@ const struct settings_list settings[] = {
CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1,
"start in screen", "previous,root,files,db,wps,menu,"
#ifdef HAVE_RECORDING
- ",recording"
+ "recording,"
#endif
#if CONFIG_TUNER
- ",radio"
+ "radio,"
#endif
- ,NULL,
+ "bookmarks" ,NULL,
#if defined(HAVE_RECORDING) && CONFIG_TUNER
- 8,
+ 9,
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
- 7,
+ 8,
#else
- 6,
+ 7,
#endif
ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU),
ID2P(LANG_DIR_BROWSER), ID2P(LANG_TAGCACHE),
- ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS_MENU)
+ ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS_MENU),
#ifdef HAVE_RECORDING
- ,ID2P(LANG_RECORDING)
+ ID2P(LANG_RECORDING),
#endif
#if CONFIG_TUNER
- ,ID2P(LANG_FM_RADIO)
+ ID2P(LANG_FM_RADIO),
#endif
-
+ ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
),
SYSTEM_SETTING(NVRAM(1),last_screen,-1),
};