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
This commit is contained in:
Jonathan Gordon 2010-06-09 08:51:29 +00:00
parent 881a5b9759
commit 10e24d22c4
5 changed files with 8 additions and 8 deletions

View file

@ -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

View file

@ -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

View file

@ -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() )
{

View file

@ -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
),

View file

@ -651,7 +651,7 @@ Lyre prototype 1 */
#endif
#if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP)
#define HAVE_PICTUREFLOW
#define HAVE_PICTUREFLOW_INTEGRATION
#endif
/* Add one HAVE_ define for all mas35xx targets */