devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#11270 by Chris Savery - WPS integration for pictureflow

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26710 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-06-09 04:25:41 +00:00
parent 1596128296
commit d871ff8cce
8 changed files with 159 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
apps/settings_list.c
View file

@ -1572,8 +1572,16 @@ const struct settings_list settings[] = {
#if CONFIG_TUNER
"radio,"
#endif
"bookmarks" ,NULL,
"bookmarks,pictureflow", NULL,
#if defined(HAVE_TAGCACHE)
#if defined(HAVE_RECORDING) && CONFIG_TUNER
10,
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
9,
#else
8,
#endif
#else
#if defined(HAVE_RECORDING) && CONFIG_TUNER
9,
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
@ -1581,14 +1589,6 @@ const struct settings_list settings[] = {
#else
7,
#endif
#else
#if defined(HAVE_RECORDING) && CONFIG_TUNER
8,
#elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */
7,
#else
6,
#endif
#endif
ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU),
ID2P(LANG_DIR_BROWSER),
@ -1602,7 +1602,8 @@ const struct settings_list settings[] = {
#if CONFIG_TUNER
ID2P(LANG_FM_RADIO),
#endif
ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
ID2P(LANG_ONPLAY_PICTUREFLOW)
),
SYSTEM_SETTING(NVRAM(1),last_screen,-1),
#if defined(HAVE_RTC_ALARM) && \
@ -1746,10 +1747,10 @@ const struct settings_list settings[] = {
#ifdef HAVE_HOTKEY
TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps,
LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps",
"off,view playlist,show track info,pitchscreen,open with,delete",
UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 6, HOTKEY_OFF,
"off,view playlist,show track info,pitchscreen,open with,delete,pictureflow",
UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7, HOTKEY_OFF,
HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
HOTKEY_OPEN_WITH, HOTKEY_DELETE),
HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_PICTUREFLOW),
TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree,
LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
"off,open with,delete,insert,insert shuffled",