summaryrefslogtreecommitdiff
path: root/apps/playlist_viewer.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-01-11 10:46:37 +0100
committerThomas Martitz <kugel@rockbox.org>2014-01-11 10:46:37 +0100
commit2d4bf62032cf1d793abfbe73942ec050161844c1 (patch)
tree8a9b73472dd493b39a023bf1dd57108f62883281 /apps/playlist_viewer.c
parentd4d3f3c494e48304d41eada0a4881a9d2b4b97f4 (diff)
downloadrockbox-2d4bf62032cf1d793abfbe73942ec050161844c1.tar.gz
rockbox-2d4bf62032cf1d793abfbe73942ec050161844c1.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
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r--apps/playlist_viewer.c10
1 files changed, 8 insertions, 2 deletions
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