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 | |
| parent | 94eef3fbee4aa178015d22f271acb343e2533acd (diff) | |
| download | rockbox-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
| -rw-r--r-- | apps/root_menu.h | 2 | ||||
| -rw-r--r-- | apps/settings_list.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/apps/root_menu.h b/apps/root_menu.h index 9b07e58..e913a67 100644 --- a/apps/root_menu.h +++ b/apps/root_menu.h @@ -35,10 +35,10 @@ enum { GO_TO_FM, #endif GO_TO_RECENTBMARKS, - GO_TO_BROWSEPLUGINS, /* Do Not add any items above here unless you want it to be able to be the "start screen" after a boot up. The setting in settings_list.c will need editing if this is the case. */ + GO_TO_BROWSEPLUGINS, }; extern const struct menu_item_ex root_menu_; 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), }; |