From edf06dc0b2d7a8cc015f1b50d3994f861efd05aa Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Wed, 9 Jun 2010 09:00:42 +0000
Subject: [PATCH] a few more HAVE_PICTUREFLOW_INTEGRATION

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26717 a1c6a512-1295-4272-9138-f99709370657
---
 apps/onplay.c        |  4 +++-
 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)
 MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING),
                   set_rating_inline, NULL,
                   ratingitem_callback, Icon_Questionmark);
+#endif                  
+#ifdef HAVE_PICTUREFLOW_INTEGRATION                  
 MENUITEM_RETURNVALUE(pictureflow_item, ID2P(LANG_ONPLAY_PICTUREFLOW), 
                   GO_TO_PICTUREFLOW, NULL, Icon_NOICON);                  
 #endif
@@ -1134,7 +1136,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
            &rating_item,
 #endif
            &bookmark_menu, 
-#ifdef HAVE_TAGCACHE
+#ifdef HAVE_PICTUREFLOW_INTEGRATION
            &pictureflow_item,
 #endif           
            &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[] = {
 #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,pictureflow",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7, HOTKEY_OFF,
+        "off,view playlist,show track info,pitchscreen,open with,delete"
+#ifdef HAVE_PICTUREFLOW_INTEGRATION        
+        ",pictureflow"
+#endif
+        ,UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 
+#ifdef HAVE_PICTUREFLOW_INTEGRATION        
+        7, 
+#else
+        6,
+#endif
+        HOTKEY_OFF,
         HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_PICTUREFLOW),
+        HOTKEY_OPEN_WITH, HOTKEY_DELETE
+#ifdef HAVE_PICTUREFLOW_INTEGRATION        
+        , HOTKEY_PICTUREFLOW
+#endif        
+        ),
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree,
         LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
         "off,open with,delete,insert,insert shuffled",