diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 09:00:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 09:00:42 +0000 |
commit | edf06dc0b2d7a8cc015f1b50d3994f861efd05aa (patch) | |
tree | 58fa50408f91637af3789975c9965f97b6b11588 /apps | |
parent | 10e24d22c40c294d224ff772d3e48d3d1ff3d8b8 (diff) | |
download | rockbox-edf06dc0b2d7a8cc015f1b50d3994f861efd05aa.tar.gz rockbox-edf06dc0b2d7a8cc015f1b50d3994f861efd05aa.zip |
a few more HAVE_PICTUREFLOW_INTEGRATION
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26717 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/onplay.c | 4 | ||||
-rw-r--r-- | apps/settings_list.c | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index b2a540e2f0..915f48e479 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -929,6 +929,8 @@ static int ratingitem_callback(int action,const struct menu_item_ex *this_item) | |||
929 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), | 929 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), |
930 | set_rating_inline, NULL, | 930 | set_rating_inline, NULL, |
931 | ratingitem_callback, Icon_Questionmark); | 931 | ratingitem_callback, Icon_Questionmark); |
932 | #endif | ||
933 | #ifdef HAVE_PICTUREFLOW_INTEGRATION | ||
932 | MENUITEM_RETURNVALUE(pictureflow_item, ID2P(LANG_ONPLAY_PICTUREFLOW), | 934 | MENUITEM_RETURNVALUE(pictureflow_item, ID2P(LANG_ONPLAY_PICTUREFLOW), |
933 | GO_TO_PICTUREFLOW, NULL, Icon_NOICON); | 935 | GO_TO_PICTUREFLOW, NULL, Icon_NOICON); |
934 | #endif | 936 | #endif |
@@ -1134,7 +1136,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), | |||
1134 | &rating_item, | 1136 | &rating_item, |
1135 | #endif | 1137 | #endif |
1136 | &bookmark_menu, | 1138 | &bookmark_menu, |
1137 | #ifdef HAVE_TAGCACHE | 1139 | #ifdef HAVE_PICTUREFLOW_INTEGRATION |
1138 | &pictureflow_item, | 1140 | &pictureflow_item, |
1139 | #endif | 1141 | #endif |
1140 | &browse_id3_item, &list_viewers_item, | 1142 | &browse_id3_item, &list_viewers_item, |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 089fd302eb..c125fbc48e 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1749,10 +1749,23 @@ const struct settings_list settings[] = { | |||
1749 | #ifdef HAVE_HOTKEY | 1749 | #ifdef HAVE_HOTKEY |
1750 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps, | 1750 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps, |
1751 | LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps", | 1751 | LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps", |
1752 | "off,view playlist,show track info,pitchscreen,open with,delete,pictureflow", | 1752 | "off,view playlist,show track info,pitchscreen,open with,delete" |
1753 | UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7, HOTKEY_OFF, | 1753 | #ifdef HAVE_PICTUREFLOW_INTEGRATION |
1754 | ",pictureflow" | ||
1755 | #endif | ||
1756 | ,UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, | ||
1757 | #ifdef HAVE_PICTUREFLOW_INTEGRATION | ||
1758 | 7, | ||
1759 | #else | ||
1760 | 6, | ||
1761 | #endif | ||
1762 | HOTKEY_OFF, | ||
1754 | HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN, | 1763 | HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN, |
1755 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_PICTUREFLOW), | 1764 | HOTKEY_OPEN_WITH, HOTKEY_DELETE |
1765 | #ifdef HAVE_PICTUREFLOW_INTEGRATION | ||
1766 | , HOTKEY_PICTUREFLOW | ||
1767 | #endif | ||
1768 | ), | ||
1756 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, | 1769 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, |
1757 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", | 1770 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", |
1758 | "off,open with,delete,insert,insert shuffled", | 1771 | "off,open with,delete,insert,insert shuffled", |