summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/mpegplayer.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2009-02-03 10:55:30 +0000
committerMichael Sevakis <jethead71@rockbox.org>2009-02-03 10:55:30 +0000
commite2a169bce53aff3e5fc300c00d3828129298d469 (patch)
tree94ebf4cc62c4a32d133ab1b6013363ad283981e8 /apps/plugins/mpegplayer/mpegplayer.c
parentaf5c4d1b272e1e05523e8ffdd0733104eaa3e199 (diff)
downloadrockbox-e2a169bce53aff3e5fc300c00d3828129298d469.tar.gz
rockbox-e2a169bce53aff3e5fc300c00d3828129298d469.zip
Gigabeat S: Get remote keymaps up to snuff and working. Do a couple tweaks on main unit ones. Cleanup keymap file a bit. Fix main button scanner to not clobber remote button. Fix a bug in actions.c where 'LAST_ITEM_IN_LIST' didn't really terminate scanning immediately. It would do an additional call into get_context_map and silently pick up ACTION_STD.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19909 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 66c647ff00..6e8f9350f8 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -170,6 +170,13 @@ PLUGIN_IRAM_DECLARE
170#define MPEG_VOLUP2 BUTTON_VOL_UP 170#define MPEG_VOLUP2 BUTTON_VOL_UP
171#define MPEG_RW BUTTON_UP 171#define MPEG_RW BUTTON_UP
172#define MPEG_FF BUTTON_DOWN 172#define MPEG_FF BUTTON_DOWN
173#define MPEG_RC_MENU BUTTON_RC_DSP
174#define MPEG_RC_STOP (BUTTON_RC_PLAY | BUTTON_REPEAT)
175#define MPEG_RC_PAUSE (BUTTON_RC_PLAY | BUTTON_REL)
176#define MPEG_RC_VOLDOWN BUTTON_RC_VOL_DOWN
177#define MPEG_RC_VOLUP BUTTON_RC_VOL_UP
178#define MPEG_RC_RW BUTTON_RC_REW
179#define MPEG_RC_FF BUTTON_RC_FF
173 180
174#elif CONFIG_KEYPAD == IRIVER_H10_PAD 181#elif CONFIG_KEYPAD == IRIVER_H10_PAD
175#define MPEG_MENU BUTTON_LEFT 182#define MPEG_MENU BUTTON_LEFT