summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/mpeg_settings.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/mpeg_settings.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/mpeg_settings.c')
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index f9f31fa88f..de667ec782 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -65,6 +65,13 @@ struct mpeg_settings settings;
65#define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP 65#define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP
66#define MPEG_START_TIME_EXIT BUTTON_POWER 66#define MPEG_START_TIME_EXIT BUTTON_POWER
67 67
68#define MPEG_START_TIME_RC_SELECT (BUTTON_RC_PLAY | BUTTON_REL)
69#define MPEG_START_TIME_RC_LEFT BUTTON_RC_REW
70#define MPEG_START_TIME_RC_RIGHT BUTTON_RC_FF
71#define MPEG_START_TIME_RC_UP BUTTON_RC_VOL_UP
72#define MPEG_START_TIME_RC_DOWN BUTTON_RC_VOL_DOWN
73#define MPEG_START_TIME_RC_EXIT (BUTTON_RC_PLAY | BUTTON_REPEAT)
74
68#elif CONFIG_KEYPAD == IRIVER_H10_PAD 75#elif CONFIG_KEYPAD == IRIVER_H10_PAD
69#define MPEG_START_TIME_SELECT BUTTON_PLAY 76#define MPEG_START_TIME_SELECT BUTTON_PLAY
70#define MPEG_START_TIME_LEFT BUTTON_LEFT 77#define MPEG_START_TIME_LEFT BUTTON_LEFT