diff options
-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 | ||||
-rw-r--r-- | firmware/export/config.h | 2 |
5 files changed, 8 insertions, 8 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) 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 b5418fc36d..b2a540e2f0 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 ef31c6acf2..c2f36892da 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 391bb47ffc..089fd302eb 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 ), diff --git a/firmware/export/config.h b/firmware/export/config.h index 72954fe55c..2039aa55f9 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -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 */ |