summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-04-06 09:01:30 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-04-06 09:01:30 +0000
commit6b7dff6e77423b6a5515948cba311557a4fcce0b (patch)
treed56b3debafdbc20ef57199b6465b3a251f2fbc4e /apps
parente3c21065fc8e5592cb97d1f235793610301133c0 (diff)
downloadrockbox-6b7dff6e77423b6a5515948cba311557a4fcce0b.tar.gz
rockbox-6b7dff6e77423b6a5515948cba311557a4fcce0b.zip
Do not stop playback until stop button has been released or shutdown
triggered. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9532 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/gwps.c2
-rw-r--r--apps/gui/gwps.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index a43f2e41fd..900074a249 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -691,6 +691,7 @@ long gui_wps_show(void)
691# ifdef WPS_EXIT_PRE 691# ifdef WPS_EXIT_PRE
692 if (lastbutton != WPS_EXIT_PRE) 692 if (lastbutton != WPS_EXIT_PRE)
693 break; 693 break;
694 case WPS_EXIT_PRE:
694# endif 695# endif
695 if (global_settings.party_mode) 696 if (global_settings.party_mode)
696 break; 697 break;
@@ -700,6 +701,7 @@ long gui_wps_show(void)
700#ifdef WPS_RC_EXIT_PRE 701#ifdef WPS_RC_EXIT_PRE
701 if (lastbutton != WPS_RC_EXIT_PRE) 702 if (lastbutton != WPS_RC_EXIT_PRE)
702 break; 703 break;
704 case WPS_RC_EXIT_PRE:
703#endif 705#endif
704 if (global_settings.party_mode) 706 if (global_settings.party_mode)
705 break; 707 break;
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index e02eb0b66c..8f51800937 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -43,6 +43,7 @@
43#define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) 43#define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL)
44#define WPS_BROWSE_PRE BUTTON_SELECT 44#define WPS_BROWSE_PRE BUTTON_SELECT
45#define WPS_EXIT BUTTON_OFF 45#define WPS_EXIT BUTTON_OFF
46#define WPS_EXIT_PRE (BUTTON_OFF | BUTTON_REL)
46#define WPS_ID3 (BUTTON_MODE | BUTTON_ON) 47#define WPS_ID3 (BUTTON_MODE | BUTTON_ON)
47#define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) 48#define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
48#define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) 49#define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT)
@@ -61,6 +62,7 @@
61#define WPS_RC_INCVOL BUTTON_RC_VOL_UP 62#define WPS_RC_INCVOL BUTTON_RC_VOL_UP
62#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN 63#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN
63#define WPS_RC_EXIT BUTTON_RC_STOP 64#define WPS_RC_EXIT BUTTON_RC_STOP
65#define WPS_RC_EXIT_PRE (BUTTON_RC_STOP | BUTTON_REL)
64#define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL) 66#define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL)
65#define WPS_RC_MENU_PRE BUTTON_RC_MODE 67#define WPS_RC_MENU_PRE BUTTON_RC_MODE
66#define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL) 68#define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL)