diff options
| author | Marcoen Hirschberg <marcoen@gmail.com> | 2008-01-27 00:18:29 +0000 |
|---|---|---|
| committer | Marcoen Hirschberg <marcoen@gmail.com> | 2008-01-27 00:18:29 +0000 |
| commit | 11298701ddee948cfb171c0976b02fb0efc677da (patch) | |
| tree | e871860809cb10e4c82bea37dbab817d409e1bc8 /apps/plugins/mpegplayer/mpeg_settings.c | |
| parent | 9ef02a5fec2fe6cfc2765e3cb0b197be09726cd8 (diff) | |
| download | rockbox-11298701ddee948cfb171c0976b02fb0efc677da.zip rockbox-11298701ddee948cfb171c0976b02fb0efc677da.tar.gz rockbox-11298701ddee948cfb171c0976b02fb0efc677da.tar.bz2 rockbox-11298701ddee948cfb171c0976b02fb0efc677da.tar.xz | |
add support for the gigabeat remote control in mpegplayer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16175 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_settings.c')
| -rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 2cc8fbc..308aee6 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -47,6 +47,13 @@ struct mpeg_settings settings; #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP #define MPEG_START_TIME_EXIT BUTTON_POWER +#define MPEG_START_TIME_RC_SELECT (BUTTON_RC_PLAY | BUTTON_REL) +#define MPEG_START_TIME_RC_LEFT BUTTON_RC_REW +#define MPEG_START_TIME_RC_RIGHT BUTTON_RC_FF +#define MPEG_START_TIME_RC_UP BUTTON_RC_VOL_UP +#define MPEG_START_TIME_RC_DOWN BUTTON_RC_VOL_DOWN +#define MPEG_START_TIME_RC_EXIT (BUTTON_RC_PLAY | BUTTON_REPEAT) + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define MPEG_START_TIME_SELECT BUTTON_PLAY #define MPEG_START_TIME_LEFT BUTTON_LEFT @@ -439,12 +446,20 @@ static int get_start_time(uint32_t duration) /* Coarse (1 minute) control */ case MPEG_START_TIME_DOWN: case MPEG_START_TIME_DOWN | BUTTON_REPEAT: +#if MPEG_START_TIME_RC_DOWN + case MPEG_START_TIME_RC_DOWN: + case MPEG_START_TIME_RC_DOWN | BUTTON_REPEAT: +#endif resume_time = increment_time(resume_time, -60*TS_SECOND, duration); slider_state = state0; break; case MPEG_START_TIME_UP: case MPEG_START_TIME_UP | BUTTON_REPEAT: +#if MPEG_START_TIME_RC_UP + case MPEG_START_TIME_RC_UP: + case MPEG_START_TIME_RC_UP | BUTTON_REPEAT: +#endif resume_time = increment_time(resume_time, 60*TS_SECOND, duration); slider_state = state0; break; @@ -452,6 +467,10 @@ static int get_start_time(uint32_t duration) /* Fine (1 second) control */ case MPEG_START_TIME_LEFT: case MPEG_START_TIME_LEFT | BUTTON_REPEAT: +#if MPEG_START_TIME_RC_LEFT + case MPEG_START_TIME_RC_LEFT: + case MPEG_START_TIME_RC_LEFT | BUTTON_REPEAT: +#endif #ifdef MPEG_START_TIME_SCROLL_UP case MPEG_START_TIME_SCROLL_UP: case MPEG_START_TIME_SCROLL_UP | BUTTON_REPEAT: @@ -462,6 +481,10 @@ static int get_start_time(uint32_t duration) case MPEG_START_TIME_RIGHT: case MPEG_START_TIME_RIGHT | BUTTON_REPEAT: +#if MPEG_START_TIME_RC_RIGHT + case MPEG_START_TIME_RC_RIGHT: + case MPEG_START_TIME_RC_RIGHT | BUTTON_REPEAT: +#endif #ifdef MPEG_START_TIME_SCROLL_DOWN case MPEG_START_TIME_SCROLL_DOWN: case MPEG_START_TIME_SCROLL_DOWN | BUTTON_REPEAT: @@ -471,12 +494,18 @@ static int get_start_time(uint32_t duration) break; case MPEG_START_TIME_SELECT: +#if MPEG_START_TIME_RC_SELECT + case MPEG_START_TIME_RC_SELECT: +#endif settings.resume_time = resume_time; button = MPEG_START_SEEK; slider_state = state9; break; case MPEG_START_TIME_EXIT: +#if MPEG_START_TIME_RC_EXIT + case MPEG_START_TIME_RC_EXIT: +#endif button = MPEG_START_EXIT; slider_state = state9; break; |