summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-09 08:51:29 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-09 08:51:29 +0000
commit10e24d22c40c294d224ff772d3e48d3d1ff3d8b8 (patch)
tree53e77355bddf58cfb842b5c697f5bd982cbb9494 /apps
parent881a5b97591c4db883c681bc71b2a0565873cbc3 (diff)
downloadrockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.tar.gz
rockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.zip
rename HAVE_PICTUREFLOW to HAVE_PICTUREFLOW_INTEGRATION to make it more clear what it is needed for
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26716 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/wps.c2
-rw-r--r--apps/onplay.c4
-rw-r--r--apps/root_menu.c4
-rw-r--r--apps/settings_list.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 939c7a4161..33e9b2167f 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -841,7 +841,7 @@ long gui_wps_show(void)
841 return GO_TO_ROOT; 841 return GO_TO_ROOT;
842 else if (retval == ONPLAY_PLAYLIST) 842 else if (retval == ONPLAY_PLAYLIST)
843 return GO_TO_PLAYLIST_VIEWER; 843 return GO_TO_PLAYLIST_VIEWER;
844#ifdef HAVE_PICTUREFLOW 844#ifdef HAVE_PICTUREFLOW_INTEGRATION
845 else if (retval == ONPLAY_PICTUREFLOW) 845 else if (retval == ONPLAY_PICTUREFLOW)
846 return GO_TO_PICTUREFLOW; 846 return GO_TO_PICTUREFLOW;
847#endif 847#endif
diff --git a/apps/onplay.c b/apps/onplay.c
index b5418fc36d..b2a540e2f0 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1250,7 +1250,7 @@ static struct hotkey_assignment hotkey_items[] = {
1250 { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, 1250 { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED,
1251 HOTKEY_FUNC(playlist_insert_shuffled, NULL), 1251 HOTKEY_FUNC(playlist_insert_shuffled, NULL),
1252 ONPLAY_OK }, 1252 ONPLAY_OK },
1253#ifdef HAVE_PICTUREFLOW 1253#ifdef HAVE_PICTUREFLOW_INTEGRATION
1254 { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, 1254 { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW,
1255 HOTKEY_FUNC(NULL, NULL), 1255 HOTKEY_FUNC(NULL, NULL),
1256 ONPLAY_PICTUREFLOW }, 1256 ONPLAY_PICTUREFLOW },
@@ -1337,7 +1337,7 @@ int onplay(char* file, int attr, int from, bool hotkey)
1337 return ONPLAY_MAINMENU; 1337 return ONPLAY_MAINMENU;
1338 case GO_TO_PLAYLIST_VIEWER: 1338 case GO_TO_PLAYLIST_VIEWER:
1339 return ONPLAY_PLAYLIST; 1339 return ONPLAY_PLAYLIST;
1340#ifdef HAVE_PICTUREFLOW 1340#ifdef HAVE_PICTUREFLOW_INTEGRATION
1341 case GO_TO_PICTUREFLOW: 1341 case GO_TO_PICTUREFLOW:
1342 return ONPLAY_PICTUREFLOW; 1342 return ONPLAY_PICTUREFLOW;
1343#endif 1343#endif
diff --git a/apps/root_menu.c b/apps/root_menu.c
index ef31c6acf2..c2f36892da 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -545,7 +545,7 @@ static int load_context_screen(int selection)
545 return GO_TO_PREVIOUS; 545 return GO_TO_PREVIOUS;
546} 546}
547 547
548#ifdef HAVE_PICTUREFLOW 548#ifdef HAVE_PICTUREFLOW_INTEGRATION
549static int load_plugin_screen(char *plug_path) 549static int load_plugin_screen(char *plug_path)
550{ 550{
551 int ret_val; 551 int ret_val;
@@ -638,7 +638,7 @@ void root_menu(void)
638 case GO_TO_ROOTITEM_CONTEXT: 638 case GO_TO_ROOTITEM_CONTEXT:
639 next_screen = load_context_screen(selected); 639 next_screen = load_context_screen(selected);
640 break; 640 break;
641#ifdef HAVE_PICTUREFLOW 641#ifdef HAVE_PICTUREFLOW_INTEGRATION
642 case GO_TO_PICTUREFLOW: 642 case GO_TO_PICTUREFLOW:
643 while ( !tagcache_is_usable() ) 643 while ( !tagcache_is_usable() )
644 { 644 {
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 391bb47ffc..089fd302eb 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1582,7 +1582,7 @@ const struct settings_list settings[] = {
1582#define START_TUNER_COUNT 0 1582#define START_TUNER_COUNT 0
1583#endif 1583#endif
1584 "bookmarks" 1584 "bookmarks"
1585#ifdef HAVE_PICTUREFLOW 1585#ifdef HAVE_PICTUREFLOW_INTEGRATION
1586#define START_PF_COUNT 1 1586#define START_PF_COUNT 1
1587 ",pictureflow" 1587 ",pictureflow"
1588#else 1588#else
@@ -1603,7 +1603,7 @@ const struct settings_list settings[] = {
1603 ID2P(LANG_FM_RADIO), 1603 ID2P(LANG_FM_RADIO),
1604#endif 1604#endif
1605 ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) 1605 ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
1606#ifdef HAVE_PICTUREFLOW 1606#ifdef HAVE_PICTUREFLOW_INTEGRATION
1607 ,ID2P(LANG_ONPLAY_PICTUREFLOW) 1607 ,ID2P(LANG_ONPLAY_PICTUREFLOW)
1608#endif 1608#endif
1609 ), 1609 ),