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) | |||
841 | return GO_TO_ROOT; | 841 | return GO_TO_ROOT; |
842 | else if (retval == ONPLAY_PLAYLIST) | 842 | else if (retval == ONPLAY_PLAYLIST) |
843 | return GO_TO_PLAYLIST_VIEWER; | 843 | return GO_TO_PLAYLIST_VIEWER; |
844 | #ifdef HAVE_PICTUREFLOW | ||
844 | else if (retval == ONPLAY_PICTUREFLOW) | 845 | else if (retval == ONPLAY_PICTUREFLOW) |
845 | return GO_TO_PICTUREFLOW; | 846 | return GO_TO_PICTUREFLOW; |
847 | #endif | ||
846 | restore = true; | 848 | restore = true; |
847 | } | 849 | } |
848 | break; | 850 | 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[] = { | |||
1250 | { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, | 1250 | { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, |
1251 | HOTKEY_FUNC(playlist_insert_shuffled, NULL), | 1251 | HOTKEY_FUNC(playlist_insert_shuffled, NULL), |
1252 | ONPLAY_OK }, | 1252 | ONPLAY_OK }, |
1253 | #ifdef HAVE_TAGCACHE | 1253 | #ifdef HAVE_PICTUREFLOW |
1254 | { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, | 1254 | { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, |
1255 | HOTKEY_FUNC(NULL, NULL), | 1255 | HOTKEY_FUNC(NULL, NULL), |
1256 | ONPLAY_PICTUREFLOW }, | 1256 | ONPLAY_PICTUREFLOW }, |
@@ -1337,7 +1337,7 @@ int onplay(char* file, int attr, int from, bool hotkey) | |||
1337 | return ONPLAY_MAINMENU; | 1337 | return ONPLAY_MAINMENU; |
1338 | case GO_TO_PLAYLIST_VIEWER: | 1338 | case GO_TO_PLAYLIST_VIEWER: |
1339 | return ONPLAY_PLAYLIST; | 1339 | return ONPLAY_PLAYLIST; |
1340 | #ifdef HAVE_TAGCACHE | 1340 | #ifdef HAVE_PICTUREFLOW |
1341 | case GO_TO_PICTUREFLOW: | 1341 | case GO_TO_PICTUREFLOW: |
1342 | return ONPLAY_PICTUREFLOW; | 1342 | return ONPLAY_PICTUREFLOW; |
1343 | #endif | 1343 | #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) | |||
545 | return GO_TO_PREVIOUS; | 545 | return GO_TO_PREVIOUS; |
546 | } | 546 | } |
547 | 547 | ||
548 | #ifdef HAVE_TAGCACHE | 548 | #ifdef HAVE_PICTUREFLOW |
549 | static int load_plugin_screen(char *plug_path) | 549 | static int load_plugin_screen(char *plug_path) |
550 | { | 550 | { |
551 | int ret_val; | 551 | int ret_val; |
@@ -638,7 +638,7 @@ void root_menu(void) | |||
638 | case GO_TO_ROOTITEM_CONTEXT: | 638 | case GO_TO_ROOTITEM_CONTEXT: |
639 | next_screen = load_context_screen(selected); | 639 | next_screen = load_context_screen(selected); |
640 | break; | 640 | break; |
641 | #ifdef HAVE_TAGCACHE | 641 | #ifdef HAVE_PICTUREFLOW |
642 | case GO_TO_PICTUREFLOW: | 642 | case GO_TO_PICTUREFLOW: |
643 | while ( !tagcache_is_usable() ) | 643 | while ( !tagcache_is_usable() ) |
644 | { | 644 | { |
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[] = { | |||
1563 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, | 1563 | CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1, |
1564 | "start in screen", "previous,root,files," | 1564 | "start in screen", "previous,root,files," |
1565 | #ifdef HAVE_TAGCACHE | 1565 | #ifdef HAVE_TAGCACHE |
1566 | #define START_DB_COUNT 1 | ||
1566 | "db," | 1567 | "db," |
1568 | #else | ||
1569 | #define START_DB_COUNT 0 | ||
1567 | #endif | 1570 | #endif |
1568 | "wps,menu," | 1571 | "wps,menu," |
1569 | #ifdef HAVE_RECORDING | 1572 | #ifdef HAVE_RECORDING |
1573 | #define START_REC_COUNT 1 | ||
1570 | "recording," | 1574 | "recording," |
1575 | #else | ||
1576 | #define START_REC_COUNT 0 | ||
1571 | #endif | 1577 | #endif |
1572 | #if CONFIG_TUNER | 1578 | #if CONFIG_TUNER |
1579 | #define START_TUNER_COUNT 1 | ||
1573 | "radio," | 1580 | "radio," |
1581 | #else | ||
1582 | #define START_TUNER_COUNT 0 | ||
1574 | #endif | 1583 | #endif |
1575 | "bookmarks,pictureflow", NULL, | 1584 | "bookmarks" |
1576 | #if defined(HAVE_TAGCACHE) | 1585 | #ifdef HAVE_PICTUREFLOW |
1577 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | 1586 | #define START_PF_COUNT 1 |
1578 | 10, | 1587 | ",pictureflow" |
1579 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | 1588 | #else |
1580 | 9, | 1589 | #define START_PF_COUNT 0 |
1581 | #else | ||
1582 | 8, | ||
1583 | #endif | ||
1584 | #else | ||
1585 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | ||
1586 | 9, | ||
1587 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | ||
1588 | 8, | ||
1589 | #else | ||
1590 | 7, | ||
1591 | #endif | ||
1592 | #endif | 1590 | #endif |
1591 | , NULL, | ||
1592 | (6 + START_DB_COUNT + START_REC_COUNT + START_TUNER_COUNT + START_PF_COUNT), | ||
1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), | 1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), |
1594 | ID2P(LANG_DIR_BROWSER), | 1594 | ID2P(LANG_DIR_BROWSER), |
1595 | #ifdef HAVE_TAGCACHE | 1595 | #ifdef HAVE_TAGCACHE |
@@ -1602,8 +1602,10 @@ const struct settings_list settings[] = { | |||
1602 | #if CONFIG_TUNER | 1602 | #if CONFIG_TUNER |
1603 | ID2P(LANG_FM_RADIO), | 1603 | ID2P(LANG_FM_RADIO), |
1604 | #endif | 1604 | #endif |
1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), | 1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) |
1606 | ID2P(LANG_ONPLAY_PICTUREFLOW) | 1606 | #ifdef HAVE_PICTUREFLOW |
1607 | ,ID2P(LANG_ONPLAY_PICTUREFLOW) | ||
1608 | #endif | ||
1607 | ), | 1609 | ), |
1608 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), | 1610 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), |
1609 | #if defined(HAVE_RTC_ALARM) && \ | 1611 | #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 */ | |||
650 | #endif | 650 | #endif |
651 | #endif | 651 | #endif |
652 | 652 | ||
653 | #if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP) | ||
654 | #define HAVE_PICTUREFLOW | ||
655 | #endif | ||
656 | |||
653 | /* Add one HAVE_ define for all mas35xx targets */ | 657 | /* Add one HAVE_ define for all mas35xx targets */ |
654 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3507D) || (CONFIG_CODEC == MAS3539F) | 658 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3507D) || (CONFIG_CODEC == MAS3539F) |
655 | #define HAVE_MAS35XX | 659 | #define HAVE_MAS35XX |