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 | 40 | ||||
| -rw-r--r-- | firmware/export/config.h | 4 |
5 files changed, 31 insertions, 23 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 1fa159ec0f..939c7a4161 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -841,8 +841,10 @@ long gui_wps_show(void) return GO_TO_ROOT; else if (retval == ONPLAY_PLAYLIST) return GO_TO_PLAYLIST_VIEWER; +#ifdef HAVE_PICTUREFLOW else if (retval == ONPLAY_PICTUREFLOW) return GO_TO_PICTUREFLOW; +#endif restore = true; } break; diff --git a/apps/onplay.c b/apps/onplay.c index e27a7a35a9..b5418fc36d 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_TAGCACHE +#ifdef HAVE_PICTUREFLOW { 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_TAGCACHE +#ifdef HAVE_PICTUREFLOW case GO_TO_PICTUREFLOW: return ONPLAY_PICTUREFLOW; #endif diff --git a/apps/root_menu.c b/apps/root_menu.c index d1a05a0c13..ef31c6acf2 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_TAGCACHE +#ifdef HAVE_PICTUREFLOW 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_TAGCACHE +#ifdef HAVE_PICTUREFLOW case GO_TO_PICTUREFLOW: while ( !tagcache_is_usable() ) { diff --git a/apps/settings_list.c b/apps/settings_list.c index 56107e7b04..391bb47ffc 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1563,33 +1563,33 @@ const struct settings_list settings[] = { CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, "start in screen", "previous,root,files," #ifdef HAVE_TAGCACHE +#define START_DB_COUNT 1 "db," +#else +#define START_DB_COUNT 0 #endif "wps,menu," #ifdef HAVE_RECORDING +#define START_REC_COUNT 1 "recording," +#else +#define START_REC_COUNT 0 #endif #if CONFIG_TUNER +#define START_TUNER_COUNT 1 "radio," +#else +#define START_TUNER_COUNT 0 #endif - "bookmarks,pictureflow", NULL, -#if defined(HAVE_TAGCACHE) - #if defined(HAVE_RECORDING) && CONFIG_TUNER - 10, - #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ - 9, - #else - 8, - #endif -#else - #if defined(HAVE_RECORDING) && CONFIG_TUNER - 9, - #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ - 8, - #else - 7, - #endif + "bookmarks" +#ifdef HAVE_PICTUREFLOW +#define START_PF_COUNT 1 + ",pictureflow" +#else +#define START_PF_COUNT 0 #endif + , NULL, + (6 + START_DB_COUNT + START_REC_COUNT + START_TUNER_COUNT + START_PF_COUNT), ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), ID2P(LANG_DIR_BROWSER), #ifdef HAVE_TAGCACHE @@ -1602,8 +1602,10 @@ const struct settings_list settings[] = { #if CONFIG_TUNER ID2P(LANG_FM_RADIO), #endif - ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), - ID2P(LANG_ONPLAY_PICTUREFLOW) + ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) +#ifdef HAVE_PICTUREFLOW + ,ID2P(LANG_ONPLAY_PICTUREFLOW) +#endif ), SYSTEM_SETTING(NVRAM(1),last_screen,-1), #if defined(HAVE_RTC_ALARM) && \ diff --git a/firmware/export/config.h b/firmware/export/config.h index 9a5aa73ed9..72954fe55c 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -650,6 +650,10 @@ Lyre prototype 1 */ #endif #endif +#if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP) +#define HAVE_PICTUREFLOW +#endif + /* Add one HAVE_ define for all mas35xx targets */ #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3507D) || (CONFIG_CODEC == MAS3539F) #define HAVE_MAS35XX |