diff options
author | James Smith <smithjd15@gmail.com> | 2021-09-29 00:21:05 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2021-09-29 00:53:48 -0400 |
commit | 4f450b6e116c806c430d32cd2aa03f77c1934510 (patch) | |
tree | a94b4c2f98b545a88f26f370ffc0f78b26ba5eb8 | |
parent | a7f2d1ffb472b72e2363ff2aa545b37d697896cc (diff) | |
download | rockbox-4f450b6e116c806c430d32cd2aa03f77c1934510.tar.gz rockbox-4f450b6e116c806c430d32cd2aa03f77c1934510.zip |
Revert "Playlist Viewer: Add file properties to playlist entry menu."
This reverts commit 67716c6b46a7780bff6b80408b3452c01bfbfdc4.
Reason for revert: Only partially working on bare-metal ports, so revert this for now.
Change-Id: I5cea7d2b6466a43aaff4c3eb90ab5d7aee736a5b
-rw-r--r-- | apps/playlist_viewer.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 07773b90e2..e0e2e787cd 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -489,8 +489,8 @@ static int onplay_menu(int index) | |||
489 | playlist_buffer_get_track(&viewer.buffer, index); | 489 | playlist_buffer_get_track(&viewer.buffer, index); |
490 | MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, | 490 | MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, |
491 | ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG), | 491 | ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG), |
492 | ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_PROPERTIES), | 492 | ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_SHUFFLE), |
493 | ID2P(LANG_SHUFFLE), ID2P(LANG_SAVE), | 493 | ID2P(LANG_SAVE), |
494 | ID2P(LANG_PLAYLISTVIEWER_SETTINGS)); | 494 | ID2P(LANG_PLAYLISTVIEWER_SETTINGS)); |
495 | bool current = (current_track->index == viewer.current_playing_track); | 495 | bool current = (current_track->index == viewer.current_playing_track); |
496 | 496 | ||
@@ -547,24 +547,16 @@ static int onplay_menu(int index) | |||
547 | ret = 0; | 547 | ret = 0; |
548 | break; | 548 | break; |
549 | case 4: | 549 | case 4: |
550 | /* file properties */ | ||
551 | struct playlist_track_info info; | ||
552 | playlist_get_track_info(viewer.playlist, current_track->index, &info); | ||
553 | |||
554 | result = filetype_load_plugin((void *)"properties", info.filename); | ||
555 | ret = (result == MENU_ATTACHED_USB) ? -1 : 0; | ||
556 | break; | ||
557 | case 5: | ||
558 | /* shuffle */ | 550 | /* shuffle */ |
559 | playlist_randomise(viewer.playlist, current_tick, false); | 551 | playlist_randomise(viewer.playlist, current_tick, false); |
560 | ret = 1; | 552 | ret = 1; |
561 | break; | 553 | break; |
562 | case 6: | 554 | case 5: |
563 | /* save playlist */ | 555 | /* save playlist */ |
564 | save_playlist_screen(viewer.playlist); | 556 | save_playlist_screen(viewer.playlist); |
565 | ret = 0; | 557 | ret = 0; |
566 | break; | 558 | break; |
567 | case 7: | 559 | case 6: |
568 | /* playlist viewer settings */ | 560 | /* playlist viewer settings */ |
569 | result = do_menu(&viewer_settings_menu, NULL, NULL, false); | 561 | result = do_menu(&viewer_settings_menu, NULL, NULL, false); |
570 | ret = (result == MENU_ATTACHED_USB) ? -1 : 0; | 562 | ret = (result == MENU_ATTACHED_USB) ? -1 : 0; |