diff options
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index e872b495b3..98f04b8eaf 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -130,9 +130,7 @@ static void update_display_line(int line, bool scroll); | |||
130 | static void scroll_display(int lines); | 130 | static void scroll_display(int lines); |
131 | static void update_first_index(void); | 131 | static void update_first_index(void); |
132 | static bool update_playlist(bool force); | 132 | static bool update_playlist(bool force); |
133 | #ifdef TREE_SHIFT | ||
134 | static int onplay_menu(int index); | 133 | static int onplay_menu(int index); |
135 | #endif | ||
136 | static bool viewer_menu(void); | 134 | static bool viewer_menu(void); |
137 | static bool show_icons(void); | 135 | static bool show_icons(void); |
138 | static bool show_indices(void); | 136 | static bool show_indices(void); |
@@ -672,7 +670,6 @@ static bool update_playlist(bool force) | |||
672 | return true; | 670 | return true; |
673 | } | 671 | } |
674 | 672 | ||
675 | #ifdef TREE_SHIFT | ||
676 | /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. | 673 | /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. |
677 | Returns -1 if USB attached, 0 if no playlist change, and 1 if playlist | 674 | Returns -1 if USB attached, 0 if no playlist change, and 1 if playlist |
678 | changed. */ | 675 | changed. */ |
@@ -747,7 +744,6 @@ static int onplay_menu(int index) | |||
747 | 744 | ||
748 | return ret; | 745 | return ret; |
749 | } | 746 | } |
750 | #endif | ||
751 | 747 | ||
752 | /* Menu of viewer options. Invoked via F1(r) or Menu(p). */ | 748 | /* Menu of viewer options. Invoked via F1(r) or Menu(p). */ |
753 | static bool viewer_menu(void) | 749 | static bool viewer_menu(void) |
@@ -918,20 +914,22 @@ bool playlist_viewer_ex(char* filename) | |||
918 | update = true; | 914 | update = true; |
919 | break; | 915 | break; |
920 | 916 | ||
921 | case TREE_SHIFT | TREE_PREV: | 917 | #ifdef TREE_PGUP |
922 | case TREE_SHIFT | TREE_PREV | BUTTON_REPEAT: | 918 | case TREE_PGUP: |
919 | case TREE_PGUP | BUTTON_REPEAT: | ||
923 | /* Pageup */ | 920 | /* Pageup */ |
924 | scroll_display(-viewer.num_display_lines); | 921 | scroll_display(-viewer.num_display_lines); |
925 | update = true; | 922 | update = true; |
926 | break; | 923 | break; |
927 | 924 | ||
928 | case TREE_SHIFT | TREE_NEXT: | 925 | case TREE_PGDN: |
929 | case TREE_SHIFT | TREE_NEXT | BUTTON_REPEAT: | 926 | case TREE_PGDN | BUTTON_REPEAT: |
930 | /* Pagedown */ | 927 | /* Pagedown */ |
931 | scroll_display(viewer.num_display_lines); | 928 | scroll_display(viewer.num_display_lines); |
932 | update = true; | 929 | update = true; |
933 | break; | 930 | break; |
934 | 931 | #endif | |
932 | |||
935 | case TREE_RUN: | 933 | case TREE_RUN: |
936 | if (viewer.move_track >= 0) | 934 | if (viewer.move_track >= 0) |
937 | { | 935 | { |
@@ -973,7 +971,10 @@ bool playlist_viewer_ex(char* filename) | |||
973 | update = true; | 971 | update = true; |
974 | break; | 972 | break; |
975 | 973 | ||
976 | case TREE_SHIFT | TREE_RUN: | 974 | case TREE_CONTEXT: |
975 | #ifdef TREE_CONTEXT2 | ||
976 | case TREE_CONTEXT2: | ||
977 | #endif | ||
977 | { | 978 | { |
978 | /* ON+PLAY menu */ | 979 | /* ON+PLAY menu */ |
979 | int ret; | 980 | int ret; |