summaryrefslogtreecommitdiff
path: root/apps/playlist_viewer.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r--apps/playlist_viewer.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 8d6429f767..e41b942538 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -680,23 +680,23 @@ static bool update_playlist(bool force)
680 changed. */ 680 changed. */
681static int onplay_menu(int index) 681static int onplay_menu(int index)
682{ 682{
683 struct menu_items menu[3]; /* increase this if you add entries! */ 683 struct menu_item items[3]; /* increase this if you add entries! */
684 int m, i=0, result, ret = 0; 684 int m, i=0, result, ret = 0;
685 bool current = (tracks[index].index == viewer.current_playing_track); 685 bool current = (tracks[index].index == viewer.current_playing_track);
686 686
687 menu[i].desc = str(LANG_REMOVE); 687 items[i].desc = str(LANG_REMOVE);
688 menu[i].voice_id = LANG_REMOVE; 688 items[i].voice_id = LANG_REMOVE;
689 i++; 689 i++;
690 690
691 menu[i].desc = str(LANG_MOVE); 691 items[i].desc = str(LANG_MOVE);
692 menu[i].voice_id = LANG_MOVE; 692 items[i].voice_id = LANG_MOVE;
693 i++; 693 i++;
694 694
695 menu[i].desc = str(LANG_FILE_OPTIONS); 695 items[i].desc = str(LANG_FILE_OPTIONS);
696 menu[i].voice_id = LANG_FILE_OPTIONS; 696 items[i].voice_id = LANG_FILE_OPTIONS;
697 i++; 697 i++;
698 698
699 m = menu_init(menu, i, NULL); 699 m = menu_init(items, i, NULL, NULL, NULL, NULL);
700 result = menu_show(m); 700 result = menu_show(m);
701 if (result == MENU_ATTACHED_USB) 701 if (result == MENU_ATTACHED_USB)
702 ret = -1; 702 ret = -1;
@@ -759,14 +759,15 @@ static bool viewer_menu(void)
759 int m; 759 int m;
760 bool result; 760 bool result;
761 761
762 struct menu_items items[] = { 762 struct menu_item items[] = {
763 { STR(LANG_SHOW_ICONS), show_icons }, 763 { STR(LANG_SHOW_ICONS), show_icons },
764 { STR(LANG_SHOW_INDICES), show_indices }, 764 { STR(LANG_SHOW_INDICES), show_indices },
765 { STR(LANG_TRACK_DISPLAY), track_display }, 765 { STR(LANG_TRACK_DISPLAY), track_display },
766 { STR(LANG_SAVE_DYNAMIC_PLAYLIST), save_playlist }, 766 { STR(LANG_SAVE_DYNAMIC_PLAYLIST), save_playlist },
767 }; 767 };
768 768
769 m=menu_init( items, sizeof(items) / sizeof(*items), NULL ); 769 m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
770 NULL, NULL, NULL );
770 result = menu_run(m); 771 result = menu_run(m);
771 menu_exit(m); 772 menu_exit(m);
772 773