summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/menus/exported_menus.h2
-rw-r--r--apps/playlist_viewer.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h
index 568791b1f0..efb6341155 100644
--- a/apps/menus/exported_menus.h
+++ b/apps/menus/exported_menus.h
@@ -39,6 +39,7 @@ extern const struct menu_item_ex
39 settings_menu_item, /* settings_menu.c */ 39 settings_menu_item, /* settings_menu.c */
40 bookmark_settings_menu, 40 bookmark_settings_menu,
41 playlist_settings, /* playlist_menu.c */ 41 playlist_settings, /* playlist_menu.c */
42 viewer_settings_menu, /* playlist_menu.c */
42 equalizer_menu, /* eq_menu.c */ 43 equalizer_menu, /* eq_menu.c */
43#ifdef AUDIOHW_HAVE_EQ 44#ifdef AUDIOHW_HAVE_EQ
44 audiohw_eq_tone_controls, /* audiohw_eq_menu.c */ 45 audiohw_eq_tone_controls, /* audiohw_eq_menu.c */
@@ -54,4 +55,3 @@ int browse_folder(void *param); /* in theme_menu.c as it is mostly used there */
54 55
55#endif /* ! PLUGIN */ 56#endif /* ! PLUGIN */
56#endif /*_EXPORTED_MENUS_H */ 57#endif /*_EXPORTED_MENUS_H */
57
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 5479ba43ba..7eed42c137 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -48,6 +48,7 @@
48#include "list.h" 48#include "list.h"
49#include "splash.h" 49#include "splash.h"
50#include "playlist_menu.h" 50#include "playlist_menu.h"
51#include "menus/exported_menus.h"
51#include "yesno.h" 52#include "yesno.h"
52 53
53/* Maximum number of tracks we can have loaded at one time */ 54/* Maximum number of tracks we can have loaded at one time */
@@ -482,7 +483,8 @@ static int onplay_menu(int index)
482 MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, 483 MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL,
483 ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG), 484 ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG),
484 ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_SHUFFLE), 485 ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_SHUFFLE),
485 ID2P(LANG_SAVE_DYNAMIC_PLAYLIST)); 486 ID2P(LANG_SAVE_DYNAMIC_PLAYLIST),
487 ID2P(LANG_PLAYLISTVIEWER_SETTINGS));
486 bool current = (current_track->index == viewer.current_playing_track); 488 bool current = (current_track->index == viewer.current_playing_track);
487 489
488 result = do_menu(&menu_items, NULL, NULL, false); 490 result = do_menu(&menu_items, NULL, NULL, false);
@@ -547,6 +549,11 @@ static int onplay_menu(int index)
547 save_playlist_screen(viewer.playlist); 549 save_playlist_screen(viewer.playlist);
548 ret = 0; 550 ret = 0;
549 break; 551 break;
552 case 6:
553 /* playlist viewer settings */
554 result = do_menu(&viewer_settings_menu, NULL, NULL, false);
555 ret = (result == MENU_ATTACHED_USB) ? -1 : 0;
556 break;
550 } 557 }
551 } 558 }
552 return ret; 559 return ret;
@@ -941,4 +948,3 @@ bool search_playlist(void)
941 } 948 }
942 return ret; 949 return ret;
943} 950}
944