devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Add support for the next/prev side buttons to mpegplayer on the Gigabeat S to control seeking.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25871 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2010-05-07 11:47:54 +00:00
parent d7ef247412
commit 79e7375ddf
1 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -170,7 +170,9 @@ PLUGIN_IRAM_DECLARE
#define MPEG_VOLDOWN2 BUTTON_VOL_DOWN #define MPEG_VOLDOWN2 BUTTON_VOL_DOWN
#define MPEG_VOLUP2 BUTTON_VOL_UP #define MPEG_VOLUP2 BUTTON_VOL_UP
#define MPEG_RW BUTTON_UP #define MPEG_RW BUTTON_UP
#define MPEG_RW2 BUTTON_PREV
#define MPEG_FF BUTTON_DOWN #define MPEG_FF BUTTON_DOWN
#define MPEG_FF2 BUTTON_NEXT
#define MPEG_RC_MENU BUTTON_RC_DSP #define MPEG_RC_MENU BUTTON_RC_DSP
#define MPEG_RC_STOP (BUTTON_RC_PLAY | BUTTON_REPEAT) #define MPEG_RC_STOP (BUTTON_RC_PLAY | BUTTON_REPEAT)
@ -1207,23 +1209,31 @@ static uint32_t wvs_ff_rw(int btn, unsigned refresh)
switch (btn) switch (btn)
{ {
case MPEG_FF: case MPEG_FF:
#ifdef MPEG_FF2
case MPEG_FF2:
#endif
#ifdef MPEG_RC_FF #ifdef MPEG_RC_FF
case MPEG_RC_FF: case MPEG_RC_FF:
#endif #endif
wvs_set_status(WVS_STATUS_FF); if (!(btn & BUTTON_REPEAT))
wvs_set_status(WVS_STATUS_FF);
btn = MPEG_FF | BUTTON_REPEAT; /* simplify code below */
break; break;
case MPEG_RW: case MPEG_RW:
#ifdef MPEG_RW2
case MPEG_RW2:
#endif
#ifdef MPEG_RC_RW #ifdef MPEG_RC_RW
case MPEG_RC_RW: case MPEG_RC_RW:
#endif #endif
wvs_set_status(WVS_STATUS_RW); if (!(btn & BUTTON_REPEAT))
wvs_set_status(WVS_STATUS_RW);
btn = MPEG_RW | BUTTON_REPEAT; /* simplify code below */
break; break;
default: default:
btn = -1; btn = -1;
} }
btn |= BUTTON_REPEAT;
while (1) while (1)
{ {
stream_keep_disk_active(); stream_keep_disk_active();
@ -1236,6 +1246,12 @@ static uint32_t wvs_ff_rw(int btn, unsigned refresh)
case MPEG_FF | BUTTON_REPEAT: case MPEG_FF | BUTTON_REPEAT:
case MPEG_RW | BUTTON_REPEAT: case MPEG_RW | BUTTON_REPEAT:
#ifdef MPEG_FF2
case MPEG_FF2 | BUTTON_REPEAT:
#endif
#ifdef MPEG_RW2
case MPEG_RW2 | BUTTON_REPEAT:
#endif
#ifdef MPEG_RC_FF #ifdef MPEG_RC_FF
case MPEG_RC_FF | BUTTON_REPEAT: case MPEG_RC_FF | BUTTON_REPEAT:
case MPEG_RC_RW | BUTTON_REPEAT: case MPEG_RC_RW | BUTTON_REPEAT:
@ -1244,6 +1260,12 @@ static uint32_t wvs_ff_rw(int btn, unsigned refresh)
case MPEG_FF | BUTTON_REL: case MPEG_FF | BUTTON_REL:
case MPEG_RW | BUTTON_REL: case MPEG_RW | BUTTON_REL:
#ifdef MPEG_FF2
case MPEG_FF2 | BUTTON_REL:
#endif
#ifdef MPEG_RW2
case MPEG_RW2 | BUTTON_REL:
#endif
#ifdef MPEG_RC_FF #ifdef MPEG_RC_FF
case MPEG_RC_FF | BUTTON_REL: case MPEG_RC_FF | BUTTON_REL:
case MPEG_RC_RW | BUTTON_REL: case MPEG_RC_RW | BUTTON_REL:
@ -1667,6 +1689,12 @@ static void button_loop(void)
case MPEG_RW: case MPEG_RW:
case MPEG_FF: case MPEG_FF:
#ifdef MPEG_RW2
case MPEG_RW2:
#endif
#ifdef MPEG_FF2
case MPEG_FF2:
#endif
#ifdef MPEG_RC_RW #ifdef MPEG_RC_RW
case MPEG_RC_RW: case MPEG_RC_RW:
case MPEG_RC_FF: case MPEG_RC_FF: