summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-05-15 06:59:18 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-05-15 06:59:18 +0000
commit264d8f69abacc4b4673b2134095b8dc3e9b80358 (patch)
treef79b16d77d2ae6021a27faa171583882a785d7f2
parent44cd303aabe64a3ac3c3698a4b15acdf15e44ee8 (diff)
downloadrockbox-264d8f69abacc4b4673b2134095b8dc3e9b80358.zip
rockbox-264d8f69abacc4b4673b2134095b8dc3e9b80358.tar.gz
rockbox-264d8f69abacc4b4673b2134095b8dc3e9b80358.tar.bz2
rockbox-264d8f69abacc4b4673b2134095b8dc3e9b80358.tar.xz
Enable next-dir skip on platforms with no directly mapped button combos (click-longclick of next/prev)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9933 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/gwps.c8
-rw-r--r--apps/gui/gwps.h8
2 files changed, 14 insertions, 2 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index ea97e61..7c9bbc6 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -369,7 +369,8 @@ long gui_wps_show(void)
case WPS_FFWD:
if (global_settings.party_mode)
break;
-#ifdef WPS_NEXT_DIR
+
+#ifdef HAVE_DIR_NAVIGATION
if (current_tick - right_lastclick < HZ)
{
audio_next_dir();
@@ -377,13 +378,15 @@ long gui_wps_show(void)
break;
}
#endif
+
#ifdef WPS_RC_REW
case WPS_RC_REW:
#endif
case WPS_REW:
if (global_settings.party_mode)
break;
-#ifdef WPS_PREV_DIR
+
+#ifdef HAVE_DIR_NAVIGATION
if (current_tick - left_lastclick < HZ)
{
audio_prev_dir();
@@ -391,6 +394,7 @@ long gui_wps_show(void)
break;
}
#endif
+
ffwd_rew(button);
break;
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 0c170f1..08299ac 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -75,6 +75,8 @@
#define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_SELECT)
#endif
+#define HAVE_DIR_NAVIGATION
+
#elif CONFIG_KEYPAD == RECORDER_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
@@ -207,6 +209,8 @@
#define WPS_AB_RESET_AB_MARKERS (BUTTON_LEFT | BUTTON_RIGHT)
#endif
+#define HAVE_DIR_NAVIGATION
+
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
/* TODO: Check WPS button assignments */
@@ -247,6 +251,8 @@
#define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
#define WPS_QUICK (BUTTON_REC | BUTTON_REPEAT)
+#define HAVE_DIR_NAVIGATION
+
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
@@ -270,6 +276,8 @@
#define WPS_NEXT_DIR (BUTTON_RIGHT | BUTTON_POWER)
#define WPS_PREV_DIR (BUTTON_LEFT | BUTTON_POWER)
+#define HAVE_DIR_NAVIGATION
+
#endif
/* constants used in line_type and as refresh_mode for wps_refresh */