diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 08:51:29 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-09 08:51:29 +0000 |
| commit | 10e24d22c40c294d224ff772d3e48d3d1ff3d8b8 (patch) | |
| tree | 53e77355bddf58cfb842b5c697f5bd982cbb9494 /apps | |
| parent | 881a5b97591c4db883c681bc71b2a0565873cbc3 (diff) | |
| download | rockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.zip rockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.tar.gz rockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.tar.bz2 rockbox-10e24d22c40c294d224ff772d3e48d3d1ff3d8b8.tar.xz | |
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.c | 2 | ||||
| -rw-r--r-- | apps/onplay.c | 4 | ||||
| -rw-r--r-- | apps/root_menu.c | 4 | ||||
| -rw-r--r-- | apps/settings_list.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 939c7a4..33e9b21 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -841,7 +841,7 @@ long gui_wps_show(void) return GO_TO_ROOT; else if (retval == ONPLAY_PLAYLIST) return GO_TO_PLAYLIST_VIEWER; -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION else if (retval == ONPLAY_PICTUREFLOW) return GO_TO_PICTUREFLOW; #endif diff --git a/apps/onplay.c b/apps/onplay.c index b5418fc..b2a540e 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -1250,7 +1250,7 @@ static struct hotkey_assignment hotkey_items[] = { { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, HOTKEY_FUNC(playlist_insert_shuffled, NULL), ONPLAY_OK }, -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, HOTKEY_FUNC(NULL, NULL), ONPLAY_PICTUREFLOW }, @@ -1337,7 +1337,7 @@ int onplay(char* file, int attr, int from, bool hotkey) return ONPLAY_MAINMENU; case GO_TO_PLAYLIST_VIEWER: return ONPLAY_PLAYLIST; -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION case GO_TO_PICTUREFLOW: return ONPLAY_PICTUREFLOW; #endif diff --git a/apps/root_menu.c b/apps/root_menu.c index ef31c6a..c2f3689 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -545,7 +545,7 @@ static int load_context_screen(int selection) return GO_TO_PREVIOUS; } -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION static int load_plugin_screen(char *plug_path) { int ret_val; @@ -638,7 +638,7 @@ void root_menu(void) case GO_TO_ROOTITEM_CONTEXT: next_screen = load_context_screen(selected); break; -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION case GO_TO_PICTUREFLOW: while ( !tagcache_is_usable() ) { diff --git a/apps/settings_list.c b/apps/settings_list.c index 391bb47..089fd30 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1582,7 +1582,7 @@ const struct settings_list settings[] = { #define START_TUNER_COUNT 0 #endif "bookmarks" -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION #define START_PF_COUNT 1 ",pictureflow" #else @@ -1603,7 +1603,7 @@ const struct settings_list settings[] = { ID2P(LANG_FM_RADIO), #endif ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) -#ifdef HAVE_PICTUREFLOW +#ifdef HAVE_PICTUREFLOW_INTEGRATION ,ID2P(LANG_ONPLAY_PICTUREFLOW) #endif ), |