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
This commit is contained in:
parent
94eef3fbee
commit
55843fdedd
2 changed files with 11 additions and 11 deletions
|
@ -35,10 +35,10 @@ enum {
|
||||||
GO_TO_FM,
|
GO_TO_FM,
|
||||||
#endif
|
#endif
|
||||||
GO_TO_RECENTBMARKS,
|
GO_TO_RECENTBMARKS,
|
||||||
GO_TO_BROWSEPLUGINS,
|
|
||||||
/* Do Not add any items above here unless you want it to be able to
|
/* 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
|
be the "start screen" after a boot up. The setting in settings_list.c
|
||||||
will need editing if this is the case. */
|
will need editing if this is the case. */
|
||||||
|
GO_TO_BROWSEPLUGINS,
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const struct menu_item_ex root_menu_;
|
extern const struct menu_item_ex root_menu_;
|
||||||
|
|
|
@ -1092,29 +1092,29 @@ const struct settings_list settings[] = {
|
||||||
CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1,
|
CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1,
|
||||||
"start in screen", "previous,root,files,db,wps,menu,"
|
"start in screen", "previous,root,files,db,wps,menu,"
|
||||||
#ifdef HAVE_RECORDING
|
#ifdef HAVE_RECORDING
|
||||||
",recording"
|
"recording,"
|
||||||
#endif
|
#endif
|
||||||
#if CONFIG_TUNER
|
#if CONFIG_TUNER
|
||||||
",radio"
|
"radio,"
|
||||||
#endif
|
#endif
|
||||||
,NULL,
|
"bookmarks" ,NULL,
|
||||||
#if defined(HAVE_RECORDING) && CONFIG_TUNER
|
#if defined(HAVE_RECORDING) && CONFIG_TUNER
|
||||||
8,
|
9,
|
||||||
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
|
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
|
||||||
7,
|
8,
|
||||||
#else
|
#else
|
||||||
6,
|
7,
|
||||||
#endif
|
#endif
|
||||||
ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU),
|
ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU),
|
||||||
ID2P(LANG_DIR_BROWSER), ID2P(LANG_TAGCACHE),
|
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
|
#ifdef HAVE_RECORDING
|
||||||
,ID2P(LANG_RECORDING)
|
ID2P(LANG_RECORDING),
|
||||||
#endif
|
#endif
|
||||||
#if CONFIG_TUNER
|
#if CONFIG_TUNER
|
||||||
,ID2P(LANG_FM_RADIO)
|
ID2P(LANG_FM_RADIO),
|
||||||
#endif
|
#endif
|
||||||
|
ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
|
||||||
),
|
),
|
||||||
SYSTEM_SETTING(NVRAM(1),last_screen,-1),
|
SYSTEM_SETTING(NVRAM(1),last_screen,-1),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue