diff options
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 67 |
1 files changed, 16 insertions, 51 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index f093efd172..4268a28c86 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -130,7 +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 BUTTON_ON | 133 | #ifdef TREE_SHIFT |
134 | static int onplay_menu(int index); | 134 | static int onplay_menu(int index); |
135 | #endif | 135 | #endif |
136 | static bool viewer_menu(void); | 136 | static bool viewer_menu(void); |
@@ -672,7 +672,7 @@ static bool update_playlist(bool force) | |||
672 | return true; | 672 | return true; |
673 | } | 673 | } |
674 | 674 | ||
675 | #ifdef BUTTON_ON | 675 | #ifdef TREE_SHIFT |
676 | /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. | 676 | /* 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 | 677 | Returns -1 if USB attached, 0 if no playlist change, and 1 if playlist |
678 | changed. */ | 678 | changed. */ |
@@ -902,67 +902,37 @@ bool playlist_viewer_ex(char* filename) | |||
902 | 902 | ||
903 | switch (button) | 903 | switch (button) |
904 | { | 904 | { |
905 | #ifdef HAVE_RECORDER_KEYPAD | 905 | case TREE_EXIT: |
906 | case BUTTON_OFF: | ||
907 | case BUTTON_LEFT: | ||
908 | #else | ||
909 | case BUTTON_STOP: | ||
910 | #endif | ||
911 | exit = true; | 906 | exit = true; |
912 | break; | 907 | break; |
913 | 908 | ||
914 | #ifdef HAVE_RECORDER_KEYPAD | 909 | case TREE_PREV: |
915 | case BUTTON_UP: | 910 | case TREE_PREV | BUTTON_REPEAT: |
916 | case BUTTON_UP | BUTTON_REPEAT: | ||
917 | #else | ||
918 | case BUTTON_LEFT: | ||
919 | case BUTTON_LEFT | BUTTON_REPEAT: | ||
920 | #endif | ||
921 | scroll_display(-1); | 911 | scroll_display(-1); |
922 | update = true; | 912 | update = true; |
923 | break; | 913 | break; |
924 | 914 | ||
925 | #ifdef HAVE_RECORDER_KEYPAD | 915 | case TREE_NEXT: |
926 | case BUTTON_DOWN: | 916 | case TREE_NEXT | BUTTON_REPEAT: |
927 | case BUTTON_DOWN | BUTTON_REPEAT: | ||
928 | #else | ||
929 | case BUTTON_RIGHT: | ||
930 | case BUTTON_RIGHT | BUTTON_REPEAT: | ||
931 | #endif | ||
932 | scroll_display(1); | 917 | scroll_display(1); |
933 | update = true; | 918 | update = true; |
934 | break; | 919 | break; |
935 | 920 | ||
936 | #ifdef BUTTON_ON | 921 | case TREE_SHIFT | TREE_PREV: |
937 | #ifdef HAVE_RECORDER_KEYPAD | 922 | case TREE_SHIFT | TREE_PREV | BUTTON_REPEAT: |
938 | case BUTTON_ON | BUTTON_UP: | ||
939 | case BUTTON_ON | BUTTON_UP | BUTTON_REPEAT: | ||
940 | #else | ||
941 | case BUTTON_ON | BUTTON_LEFT: | ||
942 | case BUTTON_ON | BUTTON_LEFT | BUTTON_REPEAT: | ||
943 | #endif | ||
944 | /* Pageup */ | 923 | /* Pageup */ |
945 | scroll_display(-viewer.num_display_lines); | 924 | scroll_display(-viewer.num_display_lines); |
946 | update = true; | 925 | update = true; |
947 | break; | 926 | break; |
948 | 927 | ||
949 | #ifdef HAVE_RECORDER_KEYPAD | 928 | case TREE_SHIFT | TREE_NEXT: |
950 | case BUTTON_ON | BUTTON_DOWN: | 929 | case TREE_SHIFT | TREE_NEXT | BUTTON_REPEAT: |
951 | case BUTTON_ON | BUTTON_DOWN | BUTTON_REPEAT: | ||
952 | #else | ||
953 | case BUTTON_ON | BUTTON_RIGHT: | ||
954 | case BUTTON_ON | BUTTON_RIGHT | BUTTON_REPEAT: | ||
955 | #endif | ||
956 | /* Pagedown */ | 930 | /* Pagedown */ |
957 | scroll_display(viewer.num_display_lines); | 931 | scroll_display(viewer.num_display_lines); |
958 | update = true; | 932 | update = true; |
959 | break; | 933 | break; |
960 | #endif /* BUTTON_ON */ | 934 | |
961 | 935 | case TREE_RUN: | |
962 | #ifdef HAVE_RECORDER_KEYPAD | ||
963 | case BUTTON_RIGHT: | ||
964 | #endif | ||
965 | case BUTTON_PLAY: | ||
966 | if (viewer.move_track >= 0) | 936 | if (viewer.move_track >= 0) |
967 | { | 937 | { |
968 | /* Move track */ | 938 | /* Move track */ |
@@ -1003,8 +973,7 @@ bool playlist_viewer_ex(char* filename) | |||
1003 | update = true; | 973 | update = true; |
1004 | break; | 974 | break; |
1005 | 975 | ||
1006 | #ifdef BUTTON_ON | 976 | case TREE_SHIFT | TREE_RUN: |
1007 | case BUTTON_ON | BUTTON_PLAY: | ||
1008 | { | 977 | { |
1009 | /* ON+PLAY menu */ | 978 | /* ON+PLAY menu */ |
1010 | int ret; | 979 | int ret; |
@@ -1030,12 +999,8 @@ bool playlist_viewer_ex(char* filename) | |||
1030 | update = true; | 999 | update = true; |
1031 | break; | 1000 | break; |
1032 | } | 1001 | } |
1033 | #endif /* BUTTON_ON */ | 1002 | |
1034 | #ifdef HAVE_RECORDER_KEYPAD | 1003 | case TREE_MENU: |
1035 | case BUTTON_F1: | ||
1036 | #else | ||
1037 | case BUTTON_MENU: | ||
1038 | #endif | ||
1039 | if (viewer_menu()) | 1004 | if (viewer_menu()) |
1040 | { | 1005 | { |
1041 | ret = true; | 1006 | ret = true; |