diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-04 00:59:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-04 00:59:42 +0000 |
commit | 55843fdedd2781228a13d1da2032b9adf3eb943b (patch) | |
tree | 521b130369fc0cba98804dfc4acd430a2b7fbfc4 /apps/settings_list.c | |
parent | 94eef3fbee4aa178015d22f271acb343e2533acd (diff) | |
download | rockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.tar.gz rockbox-55843fdedd2781228a13d1da2032b9adf3eb943b.zip |
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.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 40a48ee042..07779011f3 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1092,29 +1092,29 @@ const struct settings_list settings[] = { | |||
1092 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, | 1092 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, |
1093 | "start in screen", "previous,root,files,db,wps,menu," | 1093 | "start in screen", "previous,root,files,db,wps,menu," |
1094 | #ifdef HAVE_RECORDING | 1094 | #ifdef HAVE_RECORDING |
1095 | ",recording" | 1095 | "recording," |
1096 | #endif | 1096 | #endif |
1097 | #if CONFIG_TUNER | 1097 | #if CONFIG_TUNER |
1098 | ",radio" | 1098 | "radio," |
1099 | #endif | 1099 | #endif |
1100 | ,NULL, | 1100 | "bookmarks" ,NULL, |
1101 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | 1101 | #if defined(HAVE_RECORDING) && CONFIG_TUNER |
1102 | 8, | 1102 | 9, |
1103 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | 1103 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ |
1104 | 7, | 1104 | 8, |
1105 | #else | 1105 | #else |
1106 | 6, | 1106 | 7, |
1107 | #endif | 1107 | #endif |
1108 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), | 1108 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), |
1109 | ID2P(LANG_DIR_BROWSER), ID2P(LANG_TAGCACHE), | 1109 | ID2P(LANG_DIR_BROWSER), ID2P(LANG_TAGCACHE), |
1110 | ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS_MENU) | 1110 | ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS_MENU), |
1111 | #ifdef HAVE_RECORDING | 1111 | #ifdef HAVE_RECORDING |
1112 | ,ID2P(LANG_RECORDING) | 1112 | ID2P(LANG_RECORDING), |
1113 | #endif | 1113 | #endif |
1114 | #if CONFIG_TUNER | 1114 | #if CONFIG_TUNER |
1115 | ,ID2P(LANG_FM_RADIO) | 1115 | ID2P(LANG_FM_RADIO), |
1116 | #endif | 1116 | #endif |
1117 | 1117 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) | |
1118 | ), | 1118 | ), |
1119 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), | 1119 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), |
1120 | }; | 1120 | }; |