diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-01-11 10:46:37 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-11 10:46:37 +0100 |
| commit | 2d4bf62032cf1d793abfbe73942ec050161844c1 (patch) | |
| tree | 8a9b73472dd493b39a023bf1dd57108f62883281 | |
| parent | d4d3f3c494e48304d41eada0a4881a9d2b4b97f4 (diff) | |
| download | rockbox-2d4bf62.tar.gz rockbox-2d4bf62.zip | |
playlist_viewer: Resurrect playlist viewer settings submenu in the playlist viewer context menu.
This was lost in 97a4c1ef (svn r30177) for unkown reason but the manual still
mentions this item, so I assume it was an accident. It doesn't hurt anyway.
Fixes FS#12930.
Change-Id: I2f5cd81913ec7bb911d1117e50c010a5c1b89b52
| -rw-r--r-- | apps/menus/exported_menus.h | 2 | ||||
| -rw-r--r-- | apps/playlist_viewer.c | 10 |
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 settings_menu_item, /* settings_menu.c */ bookmark_settings_menu, playlist_settings, /* playlist_menu.c */ + viewer_settings_menu, /* playlist_menu.c */ equalizer_menu, /* eq_menu.c */ #ifdef AUDIOHW_HAVE_EQ 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 */ #endif /* ! PLUGIN */ #endif /*_EXPORTED_MENUS_H */ - 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 @@ #include "list.h" #include "splash.h" #include "playlist_menu.h" +#include "menus/exported_menus.h" #include "yesno.h" /* Maximum number of tracks we can have loaded at one time */ @@ -482,7 +483,8 @@ static int onplay_menu(int index) MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG), ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_SHUFFLE), - ID2P(LANG_SAVE_DYNAMIC_PLAYLIST)); + ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), + ID2P(LANG_PLAYLISTVIEWER_SETTINGS)); bool current = (current_track->index == viewer.current_playing_track); result = do_menu(&menu_items, NULL, NULL, false); @@ -547,6 +549,11 @@ static int onplay_menu(int index) save_playlist_screen(viewer.playlist); ret = 0; break; + case 6: + /* playlist viewer settings */ + result = do_menu(&viewer_settings_menu, NULL, NULL, false); + ret = (result == MENU_ATTACHED_USB) ? -1 : 0; + break; } } return ret; @@ -941,4 +948,3 @@ bool search_playlist(void) } return ret; } - |