diff options
author | Nils Wallménius <nils@rockbox.org> | 2008-07-06 08:44:58 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2008-07-06 08:44:58 +0000 |
commit | a6aa62860a18d8db68b93cd4c89033b38c33e18c (patch) | |
tree | c5d906faea6f226b30d9c28c4c31e62e2e3d38ea | |
parent | e721fbf5cc9f4bc1eb7b7076b62f3f3f8e2e5e16 (diff) | |
download | rockbox-a6aa62860a18d8db68b93cd4c89033b38c33e18c.tar.gz rockbox-a6aa62860a18d8db68b93cd4c89033b38c33e18c.zip |
Set svn props and add Id to headers that were missing it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17952 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-av300.c | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/keymaps/keymap-c100.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-cowond2.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-creativezv.c | 504 | ||||
-rw-r--r-- | apps/keymaps/keymap-creativezvm.c | 502 | ||||
-rw-r--r-- | apps/keymaps/keymap-e200.c | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/keymaps/keymap-hdd1630.c | 0 | ||||
-rw-r--r-- | apps/keymaps/keymap-ifp7xx.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/keymaps/keymap-mr500.c | 0 | ||||
-rw-r--r-- | apps/keymaps/keymap-newtarget.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondio.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-player.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/keymaps/keymap-sa9200.c | 0 |
15 files changed, 513 insertions, 505 deletions
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c index 47729d25a6..e528b9f311 100644 --- a/apps/keymaps/keymap-av300.c +++ b/apps/keymaps/keymap-av300.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org> | 10 | * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org> |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c index 64f162482e..70cb17ae1a 100755..100644 --- a/apps/keymaps/keymap-c100.c +++ b/apps/keymaps/keymap-c100.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2007 Mark Arigo | 10 | * Copyright (C) 2007 Mark Arigo |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 92d08177ab..2e412458e1 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 Rob Purchase | 10 | * Copyright (C) 2008 Rob Purchase |
11 | * | 11 | * |
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c index 12637f39f6..c66d19c5fa 100644 --- a/apps/keymaps/keymap-creativezv.c +++ b/apps/keymaps/keymap-creativezv.c | |||
@@ -1,256 +1,256 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 by Maurus Cuelenaere | 10 | * Copyright (C) 2008 by Maurus Cuelenaere |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |
14 | * as published by the Free Software Foundation; either version 2 | 14 | * as published by the Free Software Foundation; either version 2 |
15 | * of the License, or (at your option) any later version. | 15 | * of the License, or (at your option) any later version. |
16 | * | 16 | * |
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | /* Button Code Definitions for the Creative Zen Vision target */ | 22 | /* Button Code Definitions for the Creative Zen Vision target */ |
23 | /* Copied from ZVM target for now... */ | 23 | /* Copied from ZVM target for now... */ |
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <string.h> | 25 | #include <string.h> |
26 | #include <stdlib.h> | 26 | #include <stdlib.h> |
27 | 27 | ||
28 | #include "config.h" | 28 | #include "config.h" |
29 | #include "action.h" | 29 | #include "action.h" |
30 | #include "button.h" | 30 | #include "button.h" |
31 | #include "settings.h" | 31 | #include "settings.h" |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * The format of the list is as follows | 34 | * The format of the list is as follows |
35 | * { Action Code, Button code, Prereq button code } | 35 | * { Action Code, Button code, Prereq button code } |
36 | * if there's no need to check the previous button's value, use BUTTON_NONE | 36 | * if there's no need to check the previous button's value, use BUTTON_NONE |
37 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 37 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
38 | */ | 38 | */ |
39 | 39 | ||
40 | /* CONTEXT_CUSTOM's used in this file... | 40 | /* CONTEXT_CUSTOM's used in this file... |
41 | 41 | ||
42 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) | 42 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
43 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens | 43 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens |
44 | i.e where up/down is inc/dec | 44 | i.e where up/down is inc/dec |
45 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec | 45 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec |
46 | 46 | ||
47 | */ | 47 | */ |
48 | 48 | ||
49 | static const struct button_mapping button_context_standard[] = { | 49 | static const struct button_mapping button_context_standard[] = { |
50 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, | 50 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
51 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 51 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
52 | { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | 52 | { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
53 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 53 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
54 | 54 | ||
55 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 55 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
56 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 56 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
57 | 57 | ||
58 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 58 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
59 | 59 | ||
60 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 60 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
61 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 61 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
62 | 62 | ||
63 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 63 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
64 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 64 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
65 | 65 | ||
66 | LAST_ITEM_IN_LIST | 66 | LAST_ITEM_IN_LIST |
67 | }; /* button_context_standard */ | 67 | }; /* button_context_standard */ |
68 | 68 | ||
69 | 69 | ||
70 | static const struct button_mapping button_context_wps[] = { | 70 | static const struct button_mapping button_context_wps[] = { |
71 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 71 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
72 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 72 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
73 | 73 | ||
74 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 74 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
75 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 75 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
76 | 76 | ||
77 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
78 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 78 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
79 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 79 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
80 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 80 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
81 | 81 | ||
82 | //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT, BUTTON_CUSTOM }, | 82 | //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT, BUTTON_CUSTOM }, |
83 | //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT, BUTTON_CUSTOM }, | 83 | //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT, BUTTON_CUSTOM }, |
84 | //{ ACTION_WPS_ABRESET, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, | 84 | //{ ACTION_WPS_ABRESET, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, |
85 | 85 | ||
86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
89 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 89 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
90 | 90 | ||
91 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, | 91 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, |
92 | 92 | ||
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
95 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, | 95 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, |
96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
97 | 97 | ||
98 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 98 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
99 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, | 99 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, |
100 | LAST_ITEM_IN_LIST | 100 | LAST_ITEM_IN_LIST |
101 | }; /* button_context_wps */ | 101 | }; /* button_context_wps */ |
102 | 102 | ||
103 | static const struct button_mapping button_context_list[] = { | 103 | static const struct button_mapping button_context_list[] = { |
104 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 104 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
105 | }; /* button_context_list */ | 105 | }; /* button_context_list */ |
106 | 106 | ||
107 | static const struct button_mapping button_context_tree[] = { | 107 | static const struct button_mapping button_context_tree[] = { |
108 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 108 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
109 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 109 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
111 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 111 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
113 | }; /* button_context_tree */ | 113 | }; /* button_context_tree */ |
114 | 114 | ||
115 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 115 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
116 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 116 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
117 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 117 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
118 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 118 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
119 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 119 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
120 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 120 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
121 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | 121 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, |
122 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 122 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
123 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 123 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
124 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 124 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static const struct button_mapping button_context_settings[] = { | 128 | static const struct button_mapping button_context_settings[] = { |
129 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 129 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
130 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 130 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
131 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 131 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
132 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 132 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
133 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 133 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
134 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 134 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
135 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 135 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, |
136 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 136 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
137 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 137 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
139 | }; /* button_context_settings */ | 139 | }; /* button_context_settings */ |
140 | 140 | ||
141 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 141 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
142 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 142 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
143 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 143 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
144 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 144 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
145 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 145 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
146 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 146 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
147 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 147 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
148 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 148 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
149 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 149 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
150 | { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE }, | 150 | { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE }, |
151 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 151 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
152 | }; /* button_context_settingsgraphical */ | 152 | }; /* button_context_settingsgraphical */ |
153 | 153 | ||
154 | static const struct button_mapping button_context_yesno[] = { | 154 | static const struct button_mapping button_context_yesno[] = { |
155 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 155 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
156 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 156 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
157 | }; /* button_context_settings_yesno */ | 157 | }; /* button_context_settings_yesno */ |
158 | 158 | ||
159 | static const struct button_mapping button_context_colorchooser[] = { | 159 | static const struct button_mapping button_context_colorchooser[] = { |
160 | { ACTION_STD_OK, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 160 | { ACTION_STD_OK, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
161 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 161 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
162 | }; /* button_context_colorchooser */ | 162 | }; /* button_context_colorchooser */ |
163 | 163 | ||
164 | static const struct button_mapping button_context_eq[] = { | 164 | static const struct button_mapping button_context_eq[] = { |
165 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 165 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, |
166 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 166 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
167 | }; /* button_context_eq */ | 167 | }; /* button_context_eq */ |
168 | 168 | ||
169 | /** Bookmark Screen **/ | 169 | /** Bookmark Screen **/ |
170 | static const struct button_mapping button_context_bmark[] = { | 170 | static const struct button_mapping button_context_bmark[] = { |
171 | { ACTION_BMS_DELETE, BUTTON_BACK, BUTTON_NONE }, | 171 | { ACTION_BMS_DELETE, BUTTON_BACK, BUTTON_NONE }, |
172 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 172 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
173 | }; /* button_context_bmark */ | 173 | }; /* button_context_bmark */ |
174 | 174 | ||
175 | static const struct button_mapping button_context_time[] = { | 175 | static const struct button_mapping button_context_time[] = { |
176 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 176 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
177 | }; /* button_context_time */ | 177 | }; /* button_context_time */ |
178 | 178 | ||
179 | static const struct button_mapping button_context_quickscreen[] = { | 179 | static const struct button_mapping button_context_quickscreen[] = { |
180 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | 180 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, |
181 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 181 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
182 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 182 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
183 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 183 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
184 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 184 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
185 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 185 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
186 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 186 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
187 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 187 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
188 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 188 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
190 | }; /* button_context_quickscreen */ | 190 | }; /* button_context_quickscreen */ |
191 | 191 | ||
192 | static const struct button_mapping button_context_pitchscreen[] = { | 192 | static const struct button_mapping button_context_pitchscreen[] = { |
193 | 193 | ||
194 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 194 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
195 | }; /* button_context_pitchcreen */ | 195 | }; /* button_context_pitchcreen */ |
196 | 196 | ||
197 | static const struct button_mapping button_context_keyboard[] = { | 197 | static const struct button_mapping button_context_keyboard[] = { |
198 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 198 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
199 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 199 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
200 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 200 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
201 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 201 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
202 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM, BUTTON_NONE }, | 202 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM, BUTTON_NONE }, |
203 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, |
204 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY, BUTTON_NONE }, | 204 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY, BUTTON_NONE }, |
205 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 205 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
206 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 206 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
207 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, | 207 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
208 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 208 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
209 | { ACTION_KBD_ABORT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | 209 | { ACTION_KBD_ABORT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, |
210 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, | 210 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, |
211 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 211 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
212 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 212 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
213 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 213 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
214 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 214 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
215 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
216 | LAST_ITEM_IN_LIST | 216 | LAST_ITEM_IN_LIST |
217 | }; /* button_context_keyboard */ | 217 | }; /* button_context_keyboard */ |
218 | 218 | ||
219 | const struct button_mapping* get_context_mapping(int context) | 219 | const struct button_mapping* get_context_mapping(int context) |
220 | { | 220 | { |
221 | switch (context&~CONTEXT_REMOTE) | 221 | switch (context&~CONTEXT_REMOTE) |
222 | { | 222 | { |
223 | case CONTEXT_STD: | 223 | case CONTEXT_STD: |
224 | return button_context_standard; | 224 | return button_context_standard; |
225 | case CONTEXT_WPS: | 225 | case CONTEXT_WPS: |
226 | return button_context_wps; | 226 | return button_context_wps; |
227 | case CONTEXT_LIST: | 227 | case CONTEXT_LIST: |
228 | return button_context_list; | 228 | return button_context_list; |
229 | case CONTEXT_MAINMENU: | 229 | case CONTEXT_MAINMENU: |
230 | case CONTEXT_TREE: | 230 | case CONTEXT_TREE: |
231 | return button_context_listtree_scroll_without_combo; | 231 | return button_context_listtree_scroll_without_combo; |
232 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 232 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
233 | return button_context_tree; | 233 | return button_context_tree; |
234 | case CONTEXT_SETTINGS: | 234 | case CONTEXT_SETTINGS: |
235 | return button_context_settings; | 235 | return button_context_settings; |
236 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 236 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
237 | return button_context_settings_right_is_inc; | 237 | return button_context_settings_right_is_inc; |
238 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 238 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
239 | return button_context_colorchooser; | 239 | return button_context_colorchooser; |
240 | case CONTEXT_SETTINGS_EQ: | 240 | case CONTEXT_SETTINGS_EQ: |
241 | return button_context_eq; | 241 | return button_context_eq; |
242 | case CONTEXT_SETTINGS_TIME: | 242 | case CONTEXT_SETTINGS_TIME: |
243 | return button_context_time; | 243 | return button_context_time; |
244 | case CONTEXT_YESNOSCREEN: | 244 | case CONTEXT_YESNOSCREEN: |
245 | return button_context_yesno; | 245 | return button_context_yesno; |
246 | case CONTEXT_BOOKMARKSCREEN: | 246 | case CONTEXT_BOOKMARKSCREEN: |
247 | return button_context_bmark; | 247 | return button_context_bmark; |
248 | case CONTEXT_QUICKSCREEN: | 248 | case CONTEXT_QUICKSCREEN: |
249 | return button_context_quickscreen; | 249 | return button_context_quickscreen; |
250 | case CONTEXT_PITCHSCREEN: | 250 | case CONTEXT_PITCHSCREEN: |
251 | return button_context_pitchscreen; | 251 | return button_context_pitchscreen; |
252 | case CONTEXT_KEYBOARD: | 252 | case CONTEXT_KEYBOARD: |
253 | return button_context_keyboard; | 253 | return button_context_keyboard; |
254 | } | 254 | } |
255 | return button_context_standard; | 255 | return button_context_standard; |
256 | } | 256 | } |
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c index 16a3b8a778..4b0618e15d 100644 --- a/apps/keymaps/keymap-creativezvm.c +++ b/apps/keymaps/keymap-creativezvm.c | |||
@@ -1,255 +1,255 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 by Maurus Cuelenaere | 10 | * Copyright (C) 2008 by Maurus Cuelenaere |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |
14 | * as published by the Free Software Foundation; either version 2 | 14 | * as published by the Free Software Foundation; either version 2 |
15 | * of the License, or (at your option) any later version. | 15 | * of the License, or (at your option) any later version. |
16 | * | 16 | * |
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | /* Button Code Definitions for the Creative Zen Vision:M target */ | 22 | /* Button Code Definitions for the Creative Zen Vision:M target */ |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <string.h> | 24 | #include <string.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | 26 | ||
27 | #include "config.h" | 27 | #include "config.h" |
28 | #include "action.h" | 28 | #include "action.h" |
29 | #include "button.h" | 29 | #include "button.h" |
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * The format of the list is as follows | 33 | * The format of the list is as follows |
34 | * { Action Code, Button code, Prereq button code } | 34 | * { Action Code, Button code, Prereq button code } |
35 | * if there's no need to check the previous button's value, use BUTTON_NONE | 35 | * if there's no need to check the previous button's value, use BUTTON_NONE |
36 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 36 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
37 | */ | 37 | */ |
38 | 38 | ||
39 | /* CONTEXT_CUSTOM's used in this file... | 39 | /* CONTEXT_CUSTOM's used in this file... |
40 | 40 | ||
41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) | 41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens | 42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens |
43 | i.e where up/down is inc/dec | 43 | i.e where up/down is inc/dec |
44 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec | 44 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec |
45 | 45 | ||
46 | */ | 46 | */ |
47 | 47 | ||
48 | static const struct button_mapping button_context_standard[] = { | 48 | static const struct button_mapping button_context_standard[] = { |
49 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, | 49 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
50 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 50 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
51 | { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | 51 | { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
52 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 52 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
53 | 53 | ||
54 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 54 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
55 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 55 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
56 | 56 | ||
57 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 57 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
58 | 58 | ||
59 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 59 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
60 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 60 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
61 | 61 | ||
62 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 62 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
63 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 63 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
64 | 64 | ||
65 | LAST_ITEM_IN_LIST | 65 | LAST_ITEM_IN_LIST |
66 | }; /* button_context_standard */ | 66 | }; /* button_context_standard */ |
67 | 67 | ||
68 | 68 | ||
69 | static const struct button_mapping button_context_wps[] = { | 69 | static const struct button_mapping button_context_wps[] = { |
70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
71 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 71 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
72 | 72 | ||
73 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 73 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
74 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 74 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
75 | 75 | ||
76 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 76 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
77 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
78 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 78 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
79 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 79 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
80 | 80 | ||
81 | //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT, BUTTON_CUSTOM }, | 81 | //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT, BUTTON_CUSTOM }, |
82 | //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT, BUTTON_CUSTOM }, | 82 | //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT, BUTTON_CUSTOM }, |
83 | //{ ACTION_WPS_ABRESET, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, | 83 | //{ ACTION_WPS_ABRESET, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, |
84 | 84 | ||
85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
89 | 89 | ||
90 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, | 90 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, |
91 | 91 | ||
92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, | 94 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, |
95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
96 | 96 | ||
97 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 97 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
98 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, | 98 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, |
99 | LAST_ITEM_IN_LIST | 99 | LAST_ITEM_IN_LIST |
100 | }; /* button_context_wps */ | 100 | }; /* button_context_wps */ |
101 | 101 | ||
102 | static const struct button_mapping button_context_list[] = { | 102 | static const struct button_mapping button_context_list[] = { |
103 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 103 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
104 | }; /* button_context_list */ | 104 | }; /* button_context_list */ |
105 | 105 | ||
106 | static const struct button_mapping button_context_tree[] = { | 106 | static const struct button_mapping button_context_tree[] = { |
107 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 107 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
108 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 108 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
109 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 109 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
112 | }; /* button_context_tree */ | 112 | }; /* button_context_tree */ |
113 | 113 | ||
114 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 114 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
115 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 115 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
116 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 116 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
117 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 117 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
118 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 118 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
119 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 119 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
120 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | 120 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, |
121 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 121 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
122 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 122 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
123 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 123 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static const struct button_mapping button_context_settings[] = { | 127 | static const struct button_mapping button_context_settings[] = { |
128 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 128 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
129 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 129 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
130 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 130 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
131 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 131 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
132 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 132 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
133 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 133 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
134 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 134 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, |
135 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 135 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
136 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 136 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
137 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 137 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
138 | }; /* button_context_settings */ | 138 | }; /* button_context_settings */ |
139 | 139 | ||
140 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 140 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
141 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 141 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
142 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 142 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
143 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 143 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
144 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 144 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
145 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 145 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
146 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 146 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
147 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 147 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
148 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 148 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
149 | { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE }, | 149 | { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE }, |
150 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 150 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
151 | }; /* button_context_settingsgraphical */ | 151 | }; /* button_context_settingsgraphical */ |
152 | 152 | ||
153 | static const struct button_mapping button_context_yesno[] = { | 153 | static const struct button_mapping button_context_yesno[] = { |
154 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 154 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
156 | }; /* button_context_settings_yesno */ | 156 | }; /* button_context_settings_yesno */ |
157 | 157 | ||
158 | static const struct button_mapping button_context_colorchooser[] = { | 158 | static const struct button_mapping button_context_colorchooser[] = { |
159 | { ACTION_STD_OK, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 159 | { ACTION_STD_OK, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
161 | }; /* button_context_colorchooser */ | 161 | }; /* button_context_colorchooser */ |
162 | 162 | ||
163 | static const struct button_mapping button_context_eq[] = { | 163 | static const struct button_mapping button_context_eq[] = { |
164 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 164 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, |
165 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 165 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
166 | }; /* button_context_eq */ | 166 | }; /* button_context_eq */ |
167 | 167 | ||
168 | /** Bookmark Screen **/ | 168 | /** Bookmark Screen **/ |
169 | static const struct button_mapping button_context_bmark[] = { | 169 | static const struct button_mapping button_context_bmark[] = { |
170 | { ACTION_BMS_DELETE, BUTTON_BACK, BUTTON_NONE }, | 170 | { ACTION_BMS_DELETE, BUTTON_BACK, BUTTON_NONE }, |
171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
172 | }; /* button_context_bmark */ | 172 | }; /* button_context_bmark */ |
173 | 173 | ||
174 | static const struct button_mapping button_context_time[] = { | 174 | static const struct button_mapping button_context_time[] = { |
175 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 175 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
176 | }; /* button_context_time */ | 176 | }; /* button_context_time */ |
177 | 177 | ||
178 | static const struct button_mapping button_context_quickscreen[] = { | 178 | static const struct button_mapping button_context_quickscreen[] = { |
179 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | 179 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, |
180 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 180 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
181 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 181 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
182 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 182 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
183 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 183 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
184 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 184 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
185 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 185 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
186 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 186 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
187 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 187 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
188 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 188 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
189 | }; /* button_context_quickscreen */ | 189 | }; /* button_context_quickscreen */ |
190 | 190 | ||
191 | static const struct button_mapping button_context_pitchscreen[] = { | 191 | static const struct button_mapping button_context_pitchscreen[] = { |
192 | 192 | ||
193 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 193 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
194 | }; /* button_context_pitchcreen */ | 194 | }; /* button_context_pitchcreen */ |
195 | 195 | ||
196 | static const struct button_mapping button_context_keyboard[] = { | 196 | static const struct button_mapping button_context_keyboard[] = { |
197 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 197 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
198 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 198 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
199 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 199 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
200 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 200 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
201 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM, BUTTON_NONE }, | 201 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM, BUTTON_NONE }, |
202 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, | 202 | { ACTION_KBD_CURSOR_LEFT, BUTTON_CUSTOM|BUTTON_REPEAT, BUTTON_NONE }, |
203 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY, BUTTON_NONE }, | 203 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY, BUTTON_NONE }, |
204 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 204 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
205 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 205 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
206 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, | 206 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
207 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 207 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
208 | { ACTION_KBD_ABORT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | 208 | { ACTION_KBD_ABORT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, |
209 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, | 209 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, |
210 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 210 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
211 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 211 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
212 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 212 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
213 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 213 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
214 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 214 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
215 | LAST_ITEM_IN_LIST | 215 | LAST_ITEM_IN_LIST |
216 | }; /* button_context_keyboard */ | 216 | }; /* button_context_keyboard */ |
217 | 217 | ||
218 | const struct button_mapping* get_context_mapping(int context) | 218 | const struct button_mapping* get_context_mapping(int context) |
219 | { | 219 | { |
220 | switch (context&~CONTEXT_REMOTE) | 220 | switch (context&~CONTEXT_REMOTE) |
221 | { | 221 | { |
222 | case CONTEXT_STD: | 222 | case CONTEXT_STD: |
223 | return button_context_standard; | 223 | return button_context_standard; |
224 | case CONTEXT_WPS: | 224 | case CONTEXT_WPS: |
225 | return button_context_wps; | 225 | return button_context_wps; |
226 | case CONTEXT_LIST: | 226 | case CONTEXT_LIST: |
227 | return button_context_list; | 227 | return button_context_list; |
228 | case CONTEXT_MAINMENU: | 228 | case CONTEXT_MAINMENU: |
229 | case CONTEXT_TREE: | 229 | case CONTEXT_TREE: |
230 | return button_context_listtree_scroll_without_combo; | 230 | return button_context_listtree_scroll_without_combo; |
231 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 231 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
232 | return button_context_tree; | 232 | return button_context_tree; |
233 | case CONTEXT_SETTINGS: | 233 | case CONTEXT_SETTINGS: |
234 | return button_context_settings; | 234 | return button_context_settings; |
235 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 235 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
236 | return button_context_settings_right_is_inc; | 236 | return button_context_settings_right_is_inc; |
237 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 237 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
238 | return button_context_colorchooser; | 238 | return button_context_colorchooser; |
239 | case CONTEXT_SETTINGS_EQ: | 239 | case CONTEXT_SETTINGS_EQ: |
240 | return button_context_eq; | 240 | return button_context_eq; |
241 | case CONTEXT_SETTINGS_TIME: | 241 | case CONTEXT_SETTINGS_TIME: |
242 | return button_context_time; | 242 | return button_context_time; |
243 | case CONTEXT_YESNOSCREEN: | 243 | case CONTEXT_YESNOSCREEN: |
244 | return button_context_yesno; | 244 | return button_context_yesno; |
245 | case CONTEXT_BOOKMARKSCREEN: | 245 | case CONTEXT_BOOKMARKSCREEN: |
246 | return button_context_bmark; | 246 | return button_context_bmark; |
247 | case CONTEXT_QUICKSCREEN: | 247 | case CONTEXT_QUICKSCREEN: |
248 | return button_context_quickscreen; | 248 | return button_context_quickscreen; |
249 | case CONTEXT_PITCHSCREEN: | 249 | case CONTEXT_PITCHSCREEN: |
250 | return button_context_pitchscreen; | 250 | return button_context_pitchscreen; |
251 | case CONTEXT_KEYBOARD: | 251 | case CONTEXT_KEYBOARD: |
252 | return button_context_keyboard; | 252 | return button_context_keyboard; |
253 | } | 253 | } |
254 | return button_context_standard; | 254 | return button_context_standard; |
255 | } | 255 | } |
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index efd377f8fd..b90870a158 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) Barry Wardell 2006 | 10 | * Copyright (C) Barry Wardell 2006 |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c index e4a74cba0e..e4a74cba0e 100755..100644 --- a/apps/keymaps/keymap-hdd1630.c +++ b/apps/keymaps/keymap-hdd1630.c | |||
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c index e24e0dc798..06631438bc 100644 --- a/apps/keymaps/keymap-ifp7xx.c +++ b/apps/keymaps/keymap-ifp7xx.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2006 Tomasz Malesinski | 10 | * Copyright (C) 2006 Tomasz Malesinski |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index baf3917cbe..7d3c7216d9 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id $ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2006 Jonathan Gordon | 10 | * Copyright (C) 2006 Jonathan Gordon |
11 | * | 11 | * |
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index 7ed2e5f3ae..7ed2e5f3ae 100755..100644 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c | |||
diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c index f9af353e67..6c09184931 100644 --- a/apps/keymaps/keymap-newtarget.c +++ b/apps/keymaps/keymap-newtarget.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 200 | 10 | * Copyright (C) 200 |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index f6459a285c..39a8b55a1f 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2006 Jonathan Gordon | 10 | * Copyright (C) 2006 Jonathan Gordon |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 8bbdba9153..45fb2ebfbb 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2006 Jonathan Gordon | 10 | * Copyright (C) 2006 Jonathan Gordon |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 5787665b85..040aed65ac 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | ||
8 | * | 9 | * |
9 | * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org> | 10 | * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org> |
10 | * | 11 | * |
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index 478eea3bfe..478eea3bfe 100755..100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||