summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/keymaps/keymap-player.c54
1 files changed, 14 insertions, 40 deletions
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index f1a98d7b35..b03dc39f89 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -19,20 +19,11 @@
19/* * 19/* *
20 * Button Code Definitions for archos player targets 20 * Button Code Definitions for archos player targets
21 * 21 *
22 * \TODO test!
23 */ 22 */
24 23
25#include "config.h" 24#include "config.h"
26#include "action.h" 25#include "action.h"
27#include "button.h" 26#include "button.h"
28#include "settings.h"
29
30/* CONTEXT_CUSTOM's used in this file...
31
32CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
33
34
35*/
36 27
37struct button_mapping button_context_standard[] = { 28struct button_mapping button_context_standard[] = {
38 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, 29 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
@@ -43,26 +34,25 @@ struct button_mapping button_context_standard[] = {
43 { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, 34 { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
44 { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE }, 35 { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE },
45 { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, 36 { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE },
46 { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_ON },
47 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 37 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
48 38
49 LAST_ITEM_IN_LIST 39 LAST_ITEM_IN_LIST
50}; 40};
51 41
52struct button_mapping button_context_wps[] = { 42struct button_mapping button_context_wps[] = {
53 { ACTION_WPS_PLAY, BUTTON_PLAY, BUTTON_NONE }, 43 { ACTION_WPS_PLAY, BUTTON_PLAY, BUTTON_NONE },
54 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, 44 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE },
55 { ACTION_WPS_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, 45 { ACTION_WPS_SKIPPREV, BUTTON_LEFT, BUTTON_NONE },
56 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 46 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
57 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 47 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
58 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, 48 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
59 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, 49 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
60 { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, 50 { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE },
61 51
62 { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_STOP, BUTTON_MENU }, 52 { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU },
63 { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_STOP|BUTTON_REPEAT, BUTTON_MENU|BUTTON_STOP }, 53 { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_MENU|BUTTON_LEFT },
64 { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_PLAY, BUTTON_MENU }, 54 { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU },
65 { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_MENU|BUTTON_PLAY }, 55 { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_MENU|BUTTON_RIGHT },
66 56
67 { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, 57 { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON },
68 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 58 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
@@ -83,25 +73,13 @@ struct button_mapping button_context_settings[] = {
83}; 73};
84 74
85struct button_mapping button_context_tree[] = { 75struct button_mapping button_context_tree[] = {
86 { ACTION_TREE_WPS, BUTTON_PLAY, BUTTON_NONE }, 76 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
87 { ACTION_TREE_STOP, BUTTON_STOP, BUTTON_NONE },
88 77
89 LAST_ITEM_IN_LIST 78 LAST_ITEM_IN_LIST
90}; /* button_context_listtree */ 79}; /* button_context_listtree */
91struct button_mapping button_context_tree_scroll_lr[] = {
92 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
93 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
94 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
95 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
96 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
97 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
98 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
99 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
100 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
101};
102 80
103struct button_mapping button_context_yesno[] = { 81struct button_mapping button_context_yesno[] = {
104 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 82 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
105 LAST_ITEM_IN_LIST 83 LAST_ITEM_IN_LIST
106}; /* button_context_settings_yesno */ 84}; /* button_context_settings_yesno */
107 85
@@ -122,10 +100,6 @@ struct button_mapping* get_context_mapping( int context )
122 return button_context_yesno; 100 return button_context_yesno;
123 101
124 case CONTEXT_TREE: 102 case CONTEXT_TREE:
125 if (global_settings.hold_lr_for_scroll_in_list)
126 return button_context_tree_scroll_lr;
127 /* else fall through to CUSTOM|1 */
128 case CONTEXT_CUSTOM|1:
129 return button_context_tree; 103 return button_context_tree;
130 104
131 case CONTEXT_LIST: 105 case CONTEXT_LIST:
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 01:43:45 +0000