1
0
Fork 0
forked from len0rd/rockbox

Iriver: remote FFWD/REW support

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6883 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-06-26 21:13:14 +00:00
parent c567bb9c95
commit 9e376a557d
2 changed files with 27 additions and 5 deletions

View file

@ -105,8 +105,14 @@ static bool ffwd_rew(int button)
while (!exit) { while (!exit) {
switch ( button ) { switch ( button ) {
case WPS_FFWD: case WPS_FFWD:
#ifdef WPS_RC_FFWD
case WPS_RC_FFWD:
#endif
direction = 1; direction = 1;
case WPS_REW: case WPS_REW:
#ifdef WPS_RC_REW
case WPS_RC_REW:
#endif
if (ff_rewind) if (ff_rewind)
{ {
if (direction == 1) if (direction == 1)
@ -186,6 +192,10 @@ static bool ffwd_rew(int button)
case WPS_PREV: case WPS_PREV:
case WPS_NEXT: case WPS_NEXT:
#ifdef WPS_RC_PREV
case WPS_RC_PREV:
case WPS_RC_NEXT:
#endif
audio_ff_rewind(id3->elapsed+ff_rewind_count); audio_ff_rewind(id3->elapsed+ff_rewind_count);
ff_rewind_count = 0; ff_rewind_count = 0;
ff_rewind = false; ff_rewind = false;
@ -576,7 +586,7 @@ long wps_show(void)
case WPS_REW: case WPS_REW:
#ifdef WPS_RC_FFWD #ifdef WPS_RC_FFWD
case WPS_RC_FFWD: case WPS_RC_FFWD:
case WPS_RC_RWD: case WPS_RC_REW:
#endif #endif
ffwd_rew(button); ffwd_rew(button);
break; break;
@ -589,6 +599,10 @@ long wps_show(void)
#endif #endif
#ifdef WPS_RC_PREV #ifdef WPS_RC_PREV
case WPS_RC_PREV: case WPS_RC_PREV:
#ifdef WPS_RC_PREV_PRE
if ((button == WPS_RC_PREV) && (lastbutton != WPS_RC_PREV_PRE))
break;
#endif
#endif #endif
if (!id3 || (id3->elapsed < 3*1000)) { if (!id3 || (id3->elapsed < 3*1000)) {
audio_prev(); audio_prev();
@ -612,6 +626,10 @@ long wps_show(void)
#endif #endif
#ifdef WPS_RC_NEXT #ifdef WPS_RC_NEXT
case WPS_RC_NEXT: case WPS_RC_NEXT:
#ifdef WPS_RC_NEXT_PRE
if ((button == WPS_RC_NEXT) && (lastbutton != WPS_RC_NEXT_PRE))
break;
#endif
#endif #endif
audio_next(); audio_next();
break; break;

View file

@ -42,15 +42,19 @@
#define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
#define WPS_QUICK (BUTTON_ON | BUTTON_REPEAT) #define WPS_QUICK (BUTTON_ON | BUTTON_REPEAT)
#define WPS_RC_NEXT BUTTON_RC_FF #define WPS_RC_NEXT (BUTTON_RC_FF | BUTTON_REL)
#define WPS_RC_PREV BUTTON_RC_REW #define WPS_RC_NEXT_PRE BUTTON_RC_FF
#define WPS_RC_PREV (BUTTON_RC_REW | BUTTON_REL)
#define WPS_RC_PREV_PRE BUTTON_RC_REW
#define WPS_RC_FFWD (BUTTON_RC_FF | BUTTON_REPEAT)
#define WPS_RC_REW (BUTTON_RC_REW | BUTTON_REPEAT)
#define WPS_RC_PAUSE BUTTON_RC_ON #define WPS_RC_PAUSE BUTTON_RC_ON
#define WPS_RC_INCVOL BUTTON_RC_VOL_UP #define WPS_RC_INCVOL BUTTON_RC_VOL_UP
#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN
#define WPS_RC_EXIT BUTTON_RC_STOP #define WPS_RC_EXIT BUTTON_RC_STOP
#define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL) #define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL)
#define WPS_RC_MENU_PRE BUTTON_RC_MENU #define WPS_RC_MENU_PRE BUTTON_RC_MENU
#define WPS_RC_BROWSE (BUTTON_RC_MODE | BUTTON_REL) #define WPS_RC_BROWSE (BUTTON_RC_MODE | BUTTON_REL)
#define WPS_RC_BROWSE_PRE BUTTON_RC_MODE #define WPS_RC_BROWSE_PRE BUTTON_RC_MODE
#elif CONFIG_KEYPAD == RECORDER_PAD #elif CONFIG_KEYPAD == RECORDER_PAD