diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-11-06 16:18:55 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-11-06 16:18:55 +0000 |
commit | ce1312e383e200b2745ffb118bc85f44e37d6a87 (patch) | |
tree | b3e8114f6ef6d43e9d313767efc03b7f440aac99 | |
parent | 4caf1ce1851c58505566c0b345bc8cc194c08fb0 (diff) | |
download | rockbox-ce1312e383e200b2745ffb118bc85f44e37d6a87.tar.gz rockbox-ce1312e383e200b2745ffb118bc85f44e37d6a87.zip |
iRiver: Fixed the wps not to stop audio before shutdown has been
accepted. Please revert back if you feel this wrong.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7764 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/wps.c | 14 | ||||
-rw-r--r-- | apps/wps.h | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/apps/wps.c b/apps/wps.c index 84f862de9c..ca6e394881 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -750,10 +750,20 @@ long wps_show(void) | |||
750 | /* stop and exit wps */ | 750 | /* stop and exit wps */ |
751 | #ifdef WPS_EXIT | 751 | #ifdef WPS_EXIT |
752 | case WPS_EXIT: | 752 | case WPS_EXIT: |
753 | #ifdef WPS_RC_EXIT | 753 | # ifdef WPS_EXIT_PRE |
754 | if (lastbutton != WPS_EXIT_PRE) | ||
755 | break; | ||
756 | # endif | ||
757 | exit = true; | ||
758 | |||
759 | # ifdef WPS_RC_EXIT | ||
754 | case WPS_RC_EXIT: | 760 | case WPS_RC_EXIT: |
755 | #endif | 761 | # ifdef WPS_RC_EXIT_PRE |
762 | if (lastbutton != WPS_RC_EXIT_PRE) | ||
763 | break; | ||
764 | # endif | ||
756 | exit = true; | 765 | exit = true; |
766 | # endif | ||
757 | break; | 767 | break; |
758 | #endif | 768 | #endif |
759 | 769 | ||
diff --git a/apps/wps.h b/apps/wps.h index e1f053a3d2..b8499984a8 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -38,7 +38,8 @@ | |||
38 | #define WPS_MENU_PRE BUTTON_MODE | 38 | #define WPS_MENU_PRE BUTTON_MODE |
39 | #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) | 39 | #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) |
40 | #define WPS_BROWSE_PRE BUTTON_SELECT | 40 | #define WPS_BROWSE_PRE BUTTON_SELECT |
41 | #define WPS_EXIT BUTTON_OFF | 41 | #define WPS_EXIT (BUTTON_OFF | BUTTON_REL) |
42 | #define WPS_EXIT_PRE BUTTON_OFF | ||
42 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) | 43 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) |
43 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | 44 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) |
44 | #define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) | 45 | #define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) |
@@ -54,7 +55,8 @@ | |||
54 | #define WPS_RC_PAUSE BUTTON_RC_ON | 55 | #define WPS_RC_PAUSE BUTTON_RC_ON |
55 | #define WPS_RC_INCVOL BUTTON_RC_VOL_UP | 56 | #define WPS_RC_INCVOL BUTTON_RC_VOL_UP |
56 | #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN | 57 | #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN |
57 | #define WPS_RC_EXIT BUTTON_RC_STOP | 58 | #define WPS_RC_EXIT (BUTTON_RC_STOP | BUTTON_REL) |
59 | #define WPS_RC_EXIT_PRE BUTTON_RC_STOP | ||
58 | #define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL) | 60 | #define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL) |
59 | #define WPS_RC_MENU_PRE BUTTON_RC_MODE | 61 | #define WPS_RC_MENU_PRE BUTTON_RC_MODE |
60 | #define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL) | 62 | #define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL) |