diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 14:14:16 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 14:14:16 +0000 |
commit | f7db043fbc4f31f65f34601b39ba05a9e5e53a39 (patch) | |
tree | 093d44d2ffbba5d64f31d1824a2f09f4797acef4 /apps | |
parent | 871be001f76e91bc8f632318748276119f3348a2 (diff) | |
download | rockbox-f7db043fbc4f31f65f34601b39ba05a9e5e53a39.tar.gz rockbox-f7db043fbc4f31f65f34601b39ba05a9e5e53a39.zip |
* fix pitchscreen
* stop yes/no screen eating the first press sometimes
* add enter id3 button from wps in irivier
* update keymap-h10 from Barry Wardell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10614 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/yesno.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h10.c | 52 | ||||
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondio.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-x5.c | 4 | ||||
-rw-r--r-- | apps/screens.c | 13 |
8 files changed, 45 insertions, 43 deletions
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index d567cf9ed4..2c3d6f7e10 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -71,10 +71,10 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message, | |||
71 | gui_yesno_set_display(&(yn[i]), &(screens[i])); | 71 | gui_yesno_set_display(&(yn[i]), &(screens[i])); |
72 | gui_yesno_draw(&(yn[i])); | 72 | gui_yesno_draw(&(yn[i])); |
73 | } | 73 | } |
74 | action_signalscreenchange(); | ||
74 | while (result==-1) | 75 | while (result==-1) |
75 | { | 76 | { |
76 | button = get_action(CONTEXT_YESNOSCREEN,TIMEOUT_BLOCK); | 77 | button = get_action(CONTEXT_YESNOSCREEN,TIMEOUT_BLOCK); |
77 | DEBUGF("button=%x\n",button); | ||
78 | switch (button) | 78 | switch (button) |
79 | { | 79 | { |
80 | case ACTION_YESNO_ACCEPT: | 80 | case ACTION_YESNO_ACCEPT: |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 880d194a76..413683518c 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -31,36 +31,36 @@ | |||
31 | * if there's no need to check the previous button's value, use BUTTON_NONE | 31 | * if there's no need to check the previous button's value, use BUTTON_NONE |
32 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 32 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
33 | */ | 33 | */ |
34 | struct button_mapping button_context_standard[] = { | 34 | const struct button_mapping button_context_standard[] = { |
35 | {ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 35 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, |
36 | {ACTION_STD_PREVREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, | 36 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
37 | {ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 37 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
38 | {ACTION_STD_NEXTREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_SCROLL_DOWN}, | 38 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
39 | 39 | ||
40 | { ACTION_STD_CONTEXT, BUTTON_FF, BUTTON_NONE }, | 40 | { ACTION_STD_CONTEXT, BUTTON_FF, BUTTON_NONE }, |
41 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 41 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
42 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 42 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
43 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 43 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
44 | { ACTION_STD_QUICKSCREEN,BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 44 | { ACTION_STD_QUICKSCREEN, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
45 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 45 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
46 | 46 | ||
47 | LAST_ITEM_IN_LIST | 47 | LAST_ITEM_IN_LIST |
48 | }; /* button_context_standard */ | 48 | }; /* button_context_standard */ |
49 | 49 | ||
50 | struct button_mapping button_context_wps[] = { | 50 | const struct button_mapping button_context_wps[] = { |
51 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 51 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
52 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, | 52 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, |
53 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, | 53 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, |
54 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 54 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
55 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | 55 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
56 | { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, | 56 | { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, |
57 | { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF }, | 57 | { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, |
58 | { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT }, | 58 | { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT }, |
59 | 59 | ||
60 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 60 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
61 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_SCROLL_DOWN }, | 61 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, |
62 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, | 62 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, |
63 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, | 63 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
64 | 64 | ||
65 | { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 65 | { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
66 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 66 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
@@ -71,7 +71,7 @@ struct button_mapping button_context_wps[] = { | |||
71 | }; /* button_context_wps */ | 71 | }; /* button_context_wps */ |
72 | 72 | ||
73 | 73 | ||
74 | struct button_mapping button_context_settings[] = { | 74 | const struct button_mapping button_context_settings[] = { |
75 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 75 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, |
76 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 76 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
77 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 77 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
@@ -82,7 +82,7 @@ struct button_mapping button_context_settings[] = { | |||
82 | LAST_ITEM_IN_LIST | 82 | LAST_ITEM_IN_LIST |
83 | }; /* button_context_settings */ | 83 | }; /* button_context_settings */ |
84 | 84 | ||
85 | struct button_mapping button_context_tree[] = { | 85 | const struct button_mapping button_context_tree[] = { |
86 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | 86 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, |
87 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 87 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
88 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 88 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
@@ -90,7 +90,7 @@ struct button_mapping button_context_tree[] = { | |||
90 | LAST_ITEM_IN_LIST | 90 | LAST_ITEM_IN_LIST |
91 | }; /* button_context_tree */ | 91 | }; /* button_context_tree */ |
92 | 92 | ||
93 | struct button_mapping button_context_tree_scroll_lr[] = { | 93 | const struct button_mapping button_context_tree_scroll_lr[] = { |
94 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 94 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
95 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 95 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
96 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 96 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
@@ -102,27 +102,27 @@ struct button_mapping button_context_tree_scroll_lr[] = { | |||
102 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), | 102 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), |
103 | }; /* button_context_tree_scroll_lr */ | 103 | }; /* button_context_tree_scroll_lr */ |
104 | 104 | ||
105 | struct button_mapping button_context_yesno[] = { | 105 | const struct button_mapping button_context_yesno[] = { |
106 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, | 106 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, |
107 | LAST_ITEM_IN_LIST | 107 | LAST_ITEM_IN_LIST |
108 | }; /* button_context_settings_yesno */ | 108 | }; /* button_context_settings_yesno */ |
109 | 109 | ||
110 | struct button_mapping button_context_quickscreen[] = { | 110 | const struct button_mapping button_context_quickscreen[] = { |
111 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 111 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, |
112 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, | 112 | { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
113 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 113 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
114 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_SCROLL_DOWN }, | 114 | { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
115 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 115 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
116 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 116 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
117 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 117 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
118 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 118 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
119 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 119 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
120 | 120 | ||
121 | LAST_ITEM_IN_LIST | 121 | LAST_ITEM_IN_LIST |
122 | }; /* button_context_quickscreen */ | 122 | }; /* button_context_quickscreen */ |
123 | 123 | ||
124 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 124 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
125 | struct button_mapping* get_context_mapping(int context) | 125 | const struct button_mapping* get_context_mapping(int context) |
126 | { | 126 | { |
127 | switch (context) | 127 | switch (context) |
128 | { | 128 | { |
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index a087ea6c55..457431057e 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -84,6 +84,7 @@ const struct button_mapping button_context_wps[] = { | |||
84 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 84 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
85 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 85 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
86 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 86 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
87 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_ON }, | ||
87 | 88 | ||
88 | LAST_ITEM_IN_LIST | 89 | LAST_ITEM_IN_LIST |
89 | }; /* button_context_wps */ | 90 | }; /* button_context_wps */ |
@@ -182,9 +183,9 @@ const struct button_mapping button_context_quickscreen[] = { | |||
182 | 183 | ||
183 | const struct button_mapping button_context_pitchscreen[] = { | 184 | const struct button_mapping button_context_pitchscreen[] = { |
184 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 185 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
185 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 186 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
186 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 187 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
187 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 188 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
188 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 189 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
189 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 190 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
190 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 191 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 96e2f20e9e..6cc6de6e1c 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -131,9 +131,9 @@ const struct button_mapping button_context_quickscreen[] = { | |||
131 | 131 | ||
132 | const struct button_mapping button_context_pitchscreen[] = { | 132 | const struct button_mapping button_context_pitchscreen[] = { |
133 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 133 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
134 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_SCROLL_FWD }, | 134 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
135 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 135 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
136 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_SCROLL_BACK }, | 136 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
137 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 137 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
138 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 138 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
139 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 139 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 7ca7d20c83..12745dfb44 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -113,9 +113,9 @@ struct button_mapping button_context_bmark[] = { | |||
113 | 113 | ||
114 | const struct button_mapping button_context_pitchscreen[] = { | 114 | const struct button_mapping button_context_pitchscreen[] = { |
115 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 115 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
116 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 116 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
117 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 117 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
118 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 118 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
119 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 119 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
120 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 120 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
121 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 121 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index a0a0426d32..5dae21c57c 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -127,9 +127,9 @@ const struct button_mapping button_context_quickscreen[] = { | |||
127 | 127 | ||
128 | const struct button_mapping button_context_pitchscreen[] = { | 128 | const struct button_mapping button_context_pitchscreen[] = { |
129 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 129 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
130 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 130 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
131 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 131 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
132 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 132 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
133 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 133 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
134 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 134 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
135 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 135 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index d428de0e27..b94e98d001 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -126,9 +126,9 @@ const struct button_mapping button_context_quickscreen[] = { | |||
126 | 126 | ||
127 | const struct button_mapping button_context_pitchscreen[] = { | 127 | const struct button_mapping button_context_pitchscreen[] = { |
128 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 128 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
129 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 129 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
130 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 130 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
131 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 131 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
132 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 132 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
133 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 133 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
134 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 134 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
diff --git a/apps/screens.c b/apps/screens.c index 42faac4cfa..2a19b23c9f 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2002 Björn Stenberg | 10 | * Copyright (C) 2002 Bj�n Stenberg |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -423,13 +423,13 @@ bool pitch_screen(void) | |||
423 | 423 | ||
424 | button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK); | 424 | button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK); |
425 | switch (button) { | 425 | switch (button) { |
426 | case ACTION_PS_DEC_SMALL: | 426 | case ACTION_PS_INC_SMALL: |
427 | if ( pitch < 2000 ) | 427 | if ( pitch < 2000 ) |
428 | pitch++; | 428 | pitch++; |
429 | sound_set_pitch(pitch); | 429 | sound_set_pitch(pitch); |
430 | break; | 430 | break; |
431 | 431 | ||
432 | case ACTION_PS_DEC_BIG: | 432 | case ACTION_PS_INC_BIG: |
433 | if ( pitch < 1990 ) | 433 | if ( pitch < 1990 ) |
434 | pitch += 10; | 434 | pitch += 10; |
435 | else | 435 | else |
@@ -437,13 +437,13 @@ bool pitch_screen(void) | |||
437 | sound_set_pitch(pitch); | 437 | sound_set_pitch(pitch); |
438 | break; | 438 | break; |
439 | 439 | ||
440 | case ACTION_PS_INC_SMALL: | 440 | case ACTION_PS_DEC_SMALL: |
441 | if ( pitch > 500 ) | 441 | if ( pitch > 500 ) |
442 | pitch--; | 442 | pitch--; |
443 | sound_set_pitch(pitch); | 443 | sound_set_pitch(pitch); |
444 | break; | 444 | break; |
445 | 445 | ||
446 | case ACTION_PS_INC_BIG: | 446 | case ACTION_PS_DEC_BIG: |
447 | if ( pitch > 510 ) | 447 | if ( pitch > 510 ) |
448 | pitch -= 10; | 448 | pitch -= 10; |
449 | else | 449 | else |
@@ -471,6 +471,7 @@ bool pitch_screen(void) | |||
471 | sound_set_pitch(pitch); | 471 | sound_set_pitch(pitch); |
472 | pitch_screen_draw(pitch); | 472 | pitch_screen_draw(pitch); |
473 | } | 473 | } |
474 | break; | ||
474 | case ACTION_PS_NUDGE_LEFTOFF: | 475 | case ACTION_PS_NUDGE_LEFTOFF: |
475 | pitch += 20; | 476 | pitch += 20; |
476 | sound_set_pitch(pitch); | 477 | sound_set_pitch(pitch); |
@@ -481,7 +482,7 @@ bool pitch_screen(void) | |||
481 | sound_set_pitch( pitch ); | 482 | sound_set_pitch( pitch ); |
482 | break; | 483 | break; |
483 | 484 | ||
484 | case ACTION_STD_CANCEL: | 485 | case ACTION_PS_EXIT: |
485 | exit = true; | 486 | exit = true; |
486 | break; | 487 | break; |
487 | 488 | ||