diff options
| author | Magnus Holmgren <magnushol@gmail.com> | 2006-04-09 17:08:32 +0000 |
|---|---|---|
| committer | Magnus Holmgren <magnushol@gmail.com> | 2006-04-09 17:08:32 +0000 |
| commit | 92ff0e292d929d91062b9989cc50be8dd7bd93aa (patch) | |
| tree | 39575aa6e70f1bccc25cc66e555f457dc2459841 /apps | |
| parent | 25e367ce34acc469656ab769710beec862a428dc (diff) | |
| download | rockbox-92ff0e292d929d91062b9989cc50be8dd7bd93aa.zip rockbox-92ff0e292d929d91062b9989cc50be8dd7bd93aa.tar.gz rockbox-92ff0e292d929d91062b9989cc50be8dd7bd93aa.tar.bz2 rockbox-92ff0e292d929d91062b9989cc50be8dd7bd93aa.tar.xz | |
Back out the 'do not stop playback until stop button has been released' change, because of interaction issues with exiting menus using the same button, causing the wps to exit. (Also, the '_PRE' suffix is for 'preceeding' events (e.g., button presses), not button releases.)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9584 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/gwps.c | 2 | ||||
| -rw-r--r-- | apps/gui/gwps.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 900074a..a43f2e4 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -691,7 +691,6 @@ long gui_wps_show(void) # ifdef WPS_EXIT_PRE if (lastbutton != WPS_EXIT_PRE) break; - case WPS_EXIT_PRE: # endif if (global_settings.party_mode) break; @@ -701,7 +700,6 @@ long gui_wps_show(void) #ifdef WPS_RC_EXIT_PRE if (lastbutton != WPS_RC_EXIT_PRE) break; - case WPS_RC_EXIT_PRE: #endif if (global_settings.party_mode) break; diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 8f51800..e02eb0b 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -43,7 +43,6 @@ #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) #define WPS_BROWSE_PRE BUTTON_SELECT #define WPS_EXIT BUTTON_OFF -#define WPS_EXIT_PRE (BUTTON_OFF | BUTTON_REL) #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) #define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) @@ -62,7 +61,6 @@ #define WPS_RC_INCVOL BUTTON_RC_VOL_UP #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN #define WPS_RC_EXIT BUTTON_RC_STOP -#define WPS_RC_EXIT_PRE (BUTTON_RC_STOP | BUTTON_REL) #define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL) #define WPS_RC_MENU_PRE BUTTON_RC_MODE #define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL) |