len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename HAVE_PICTUREFLOW to HAVE_PICTUREFLOW_INTEGRATION to make it more clear what it is needed for

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/wps.c
View file

@ -841,7 +841,7 @@ long gui_wps_show(void)
return GO_TO_ROOT; return GO_TO_ROOT;
else if (retval == ONPLAY_PLAYLIST) else if (retval == ONPLAY_PLAYLIST)
return GO_TO_PLAYLIST_VIEWER; return GO_TO_PLAYLIST_VIEWER;
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
else if (retval == ONPLAY_PICTUREFLOW) else if (retval == ONPLAY_PICTUREFLOW)
return GO_TO_PICTUREFLOW; return GO_TO_PICTUREFLOW;
#endif #endif

4
apps/onplay.c
View file

@ -1250,7 +1250,7 @@ static struct hotkey_assignment hotkey_items[] = {
{ HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED,
HOTKEY_FUNC(playlist_insert_shuffled, NULL), HOTKEY_FUNC(playlist_insert_shuffled, NULL),
ONPLAY_OK }, ONPLAY_OK },
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
{ HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW,
HOTKEY_FUNC(NULL, NULL), HOTKEY_FUNC(NULL, NULL),
ONPLAY_PICTUREFLOW }, ONPLAY_PICTUREFLOW },
@ -1337,7 +1337,7 @@ int onplay(char* file, int attr, int from, bool hotkey)
return ONPLAY_MAINMENU; return ONPLAY_MAINMENU;
case GO_TO_PLAYLIST_VIEWER: case GO_TO_PLAYLIST_VIEWER:
return ONPLAY_PLAYLIST; return ONPLAY_PLAYLIST;
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
case GO_TO_PICTUREFLOW: case GO_TO_PICTUREFLOW:
return ONPLAY_PICTUREFLOW; return ONPLAY_PICTUREFLOW;
#endif #endif

4
apps/root_menu.c
View file

@ -545,7 +545,7 @@ static int load_context_screen(int selection)
return GO_TO_PREVIOUS; return GO_TO_PREVIOUS;
} }
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
static int load_plugin_screen(char *plug_path) static int load_plugin_screen(char *plug_path)
{ {
int ret_val; int ret_val;
@ -638,7 +638,7 @@ void root_menu(void)
case GO_TO_ROOTITEM_CONTEXT: case GO_TO_ROOTITEM_CONTEXT:
next_screen = load_context_screen(selected); next_screen = load_context_screen(selected);
break; break;
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
case GO_TO_PICTUREFLOW: case GO_TO_PICTUREFLOW:
while ( !tagcache_is_usable() ) while ( !tagcache_is_usable() )
{ {

4
apps/settings_list.c
View file

@ -1582,7 +1582,7 @@ const struct settings_list settings[] = {
#define START_TUNER_COUNT 0 #define START_TUNER_COUNT 0
#endif #endif
"bookmarks" "bookmarks"
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
#define START_PF_COUNT 1 #define START_PF_COUNT 1
",pictureflow" ",pictureflow"
#else #else
@ -1603,7 +1603,7 @@ const struct settings_list settings[] = {
ID2P(LANG_FM_RADIO), ID2P(LANG_FM_RADIO),
#endif #endif
ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS)
#ifdef HAVE_PICTUREFLOW #ifdef HAVE_PICTUREFLOW_INTEGRATION
,ID2P(LANG_ONPLAY_PICTUREFLOW) ,ID2P(LANG_ONPLAY_PICTUREFLOW)
#endif #endif
), ),

2
firmware/export/config.h
View file

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