diff options
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 1935552b8f..ae27211ac2 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -390,7 +390,7 @@ static void format_line(const struct playlist_entry* track, char* str, | |||
390 | 390 | ||
391 | if (track->skipped) | 391 | if (track->skipped) |
392 | skipped = "(ERR) "; | 392 | skipped = "(ERR) "; |
393 | 393 | ||
394 | if (global_settings.playlist_viewer_indices) | 394 | if (global_settings.playlist_viewer_indices) |
395 | /* Display playlist index */ | 395 | /* Display playlist index */ |
396 | snprintf(str, len, "%d. %s%s", track->display_index, skipped, name); | 396 | snprintf(str, len, "%d. %s%s", track->display_index, skipped, name); |
@@ -537,7 +537,7 @@ static bool track_display(void) | |||
537 | { STR(LANG_DISPLAY_FULL_PATH) } | 537 | { STR(LANG_DISPLAY_FULL_PATH) } |
538 | }; | 538 | }; |
539 | 539 | ||
540 | return set_option((char *)str(LANG_TRACK_DISPLAY), | 540 | return set_option((char *)str(LANG_TRACK_DISPLAY), |
541 | &global_settings.playlist_viewer_track_display, INT, names, 2, | 541 | &global_settings.playlist_viewer_track_display, INT, names, 2, |
542 | NULL); | 542 | NULL); |
543 | } | 543 | } |
@@ -767,8 +767,11 @@ bool playlist_viewer_ex(char* filename) | |||
767 | gui_synclist_draw(&playlist_lists); | 767 | gui_synclist_draw(&playlist_lists); |
768 | break; | 768 | break; |
769 | } | 769 | } |
770 | 770 | #ifdef TREE_MENU_PRE | |
771 | case TREE_MENU_PRE: | ||
772 | #else | ||
771 | case TREE_MENU: | 773 | case TREE_MENU: |
774 | #endif | ||
772 | #ifdef TREE_RC_MENU | 775 | #ifdef TREE_RC_MENU |
773 | case TREE_RC_MENU: | 776 | case TREE_RC_MENU: |
774 | #endif | 777 | #endif |
@@ -808,7 +811,7 @@ exit: | |||
808 | char * playlist_search_callback_name(int selected_item, void * data, char *buffer) | 811 | char * playlist_search_callback_name(int selected_item, void * data, char *buffer) |
809 | { | 812 | { |
810 | int *found_indicies = (int*)data; | 813 | int *found_indicies = (int*)data; |
811 | static struct playlist_track_info track; | 814 | static struct playlist_track_info track; |
812 | playlist_get_track_info(viewer.playlist,found_indicies[selected_item],&track); | 815 | playlist_get_track_info(viewer.playlist,found_indicies[selected_item],&track); |
813 | format_name(buffer,track.filename); | 816 | format_name(buffer,track.filename); |
814 | return(buffer); | 817 | return(buffer); |
@@ -834,12 +837,12 @@ bool search_playlist(void) | |||
834 | int button; | 837 | int button; |
835 | struct gui_synclist playlist_lists; | 838 | struct gui_synclist playlist_lists; |
836 | struct playlist_track_info track; | 839 | struct playlist_track_info track; |
837 | 840 | ||
838 | if (!playlist_viewer_init(&viewer, 0, false)) | 841 | if (!playlist_viewer_init(&viewer, 0, false)) |
839 | return ret; | 842 | return ret; |
840 | if (kbd_input(search_str,sizeof(search_str)) == -1) | 843 | if (kbd_input(search_str,sizeof(search_str)) == -1) |
841 | return ret; | 844 | return ret; |
842 | lcd_clear_display(); | 845 | lcd_clear_display(); |
843 | playlist_count = playlist_amount_ex(viewer.playlist); | 846 | playlist_count = playlist_amount_ex(viewer.playlist); |
844 | for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++) | 847 | for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++) |
845 | { | 848 | { |