diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-10-04 23:08:41 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-10-04 23:08:41 +0000 |
commit | ff4b21d79577ce6f9408c085b44a926b13152c30 (patch) | |
tree | 425986f6d538075e18f8886396d47c4e48b20c51 /apps | |
parent | 305aaf29f388979a6c4edb625bc51b122e8357d7 (diff) | |
download | rockbox-ff4b21d79577ce6f9408c085b44a926b13152c30.tar.gz rockbox-ff4b21d79577ce6f9408c085b44a926b13152c30.zip |
Moved most actions off of button release events.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5164 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.h | 22 | ||||
-rw-r--r-- | apps/settings.h | 20 | ||||
-rw-r--r-- | apps/tree.h | 4 | ||||
-rw-r--r-- | apps/wps.c | 7 |
4 files changed, 30 insertions, 23 deletions
diff --git a/apps/menu.h b/apps/menu.h index 7ebfbf316c..d7cdfbf6d6 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -26,25 +26,25 @@ | |||
26 | #if CONFIG_KEYPAD == RECORDER_PAD | 26 | #if CONFIG_KEYPAD == RECORDER_PAD |
27 | #define MENU_NEXT BUTTON_DOWN | 27 | #define MENU_NEXT BUTTON_DOWN |
28 | #define MENU_PREV BUTTON_UP | 28 | #define MENU_PREV BUTTON_UP |
29 | #define MENU_EXIT (BUTTON_LEFT | BUTTON_REL) | 29 | #define MENU_EXIT BUTTON_LEFT |
30 | #define MENU_EXIT2 (BUTTON_OFF | BUTTON_REL) | 30 | #define MENU_EXIT2 BUTTON_OFF |
31 | #define MENU_EXIT3 (BUTTON_F1 | BUTTON_REL) | 31 | #define MENU_EXIT3 BUTTON_F1 |
32 | #define MENU_ENTER (BUTTON_RIGHT | BUTTON_REL) | 32 | #define MENU_ENTER BUTTON_RIGHT |
33 | #define MENU_ENTER2 (BUTTON_PLAY | BUTTON_REL) | 33 | #define MENU_ENTER2 BUTTON_PLAY |
34 | 34 | ||
35 | #elif CONFIG_KEYPAD == PLAYER_PAD | 35 | #elif CONFIG_KEYPAD == PLAYER_PAD |
36 | #define MENU_NEXT BUTTON_RIGHT | 36 | #define MENU_NEXT BUTTON_RIGHT |
37 | #define MENU_PREV BUTTON_LEFT | 37 | #define MENU_PREV BUTTON_LEFT |
38 | #define MENU_EXIT (BUTTON_STOP | BUTTON_REL) | 38 | #define MENU_EXIT BUTTON_STOP |
39 | #define MENU_EXIT2 (BUTTON_MENU | BUTTON_REL) | 39 | #define MENU_EXIT2 BUTTON_MENU |
40 | #define MENU_ENTER (BUTTON_PLAY | BUTTON_REL) | 40 | #define MENU_ENTER BUTTON_PLAY |
41 | 41 | ||
42 | #elif CONFIG_KEYPAD == ONDIO_PAD | 42 | #elif CONFIG_KEYPAD == ONDIO_PAD |
43 | #define MENU_NEXT BUTTON_DOWN | 43 | #define MENU_NEXT BUTTON_DOWN |
44 | #define MENU_PREV BUTTON_UP | 44 | #define MENU_PREV BUTTON_UP |
45 | #define MENU_EXIT (BUTTON_LEFT | BUTTON_REL) | 45 | #define MENU_EXIT BUTTON_LEFT |
46 | #define MENU_EXIT2 (BUTTON_MENU | BUTTON_REL) | 46 | #define MENU_EXIT2 BUTTON_MENU |
47 | #define MENU_ENTER (BUTTON_RIGHT | BUTTON_REL) | 47 | #define MENU_ENTER BUTTON_RIGHT |
48 | 48 | ||
49 | #endif | 49 | #endif |
50 | 50 | ||
diff --git a/apps/settings.h b/apps/settings.h index b6d37a0aab..2b86bdd8c7 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -37,24 +37,24 @@ | |||
37 | #if CONFIG_KEYPAD == RECORDER_PAD | 37 | #if CONFIG_KEYPAD == RECORDER_PAD |
38 | #define SETTINGS_INC BUTTON_UP | 38 | #define SETTINGS_INC BUTTON_UP |
39 | #define SETTINGS_DEC BUTTON_DOWN | 39 | #define SETTINGS_DEC BUTTON_DOWN |
40 | #define SETTINGS_OK (BUTTON_PLAY|BUTTON_REL) | 40 | #define SETTINGS_OK BUTTON_PLAY |
41 | #define SETTINGS_OK2 (BUTTON_LEFT|BUTTON_REL) | 41 | #define SETTINGS_OK2 BUTTON_LEFT |
42 | #define SETTINGS_CANCEL (BUTTON_OFF|BUTTON_REL) | 42 | #define SETTINGS_CANCEL BUTTON_OFF |
43 | #define SETTINGS_CANCEL2 (BUTTON_F1|BUTTON_REL) | 43 | #define SETTINGS_CANCEL2 BUTTON_F1 |
44 | 44 | ||
45 | #elif CONFIG_KEYPAD == PLAYER_PAD | 45 | #elif CONFIG_KEYPAD == PLAYER_PAD |
46 | #define SETTINGS_INC BUTTON_RIGHT | 46 | #define SETTINGS_INC BUTTON_RIGHT |
47 | #define SETTINGS_DEC BUTTON_LEFT | 47 | #define SETTINGS_DEC BUTTON_LEFT |
48 | #define SETTINGS_OK (BUTTON_PLAY|BUTTON_REL) | 48 | #define SETTINGS_OK BUTTON_PLAY |
49 | #define SETTINGS_CANCEL (BUTTON_STOP|BUTTON_REL) | 49 | #define SETTINGS_CANCEL BUTTON_STOP |
50 | #define SETTINGS_CANCEL2 (BUTTON_MENU|BUTTON_REL) | 50 | #define SETTINGS_CANCEL2 BUTTON_MENU |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == ONDIO_PAD | 52 | #elif CONFIG_KEYPAD == ONDIO_PAD |
53 | #define SETTINGS_INC BUTTON_UP | 53 | #define SETTINGS_INC BUTTON_UP |
54 | #define SETTINGS_DEC BUTTON_DOWN | 54 | #define SETTINGS_DEC BUTTON_DOWN |
55 | #define SETTINGS_OK (BUTTON_RIGHT|BUTTON_REL) | 55 | #define SETTINGS_OK BUTTON_RIGHT |
56 | #define SETTINGS_OK2 (BUTTON_LEFT|BUTTON_REL) | 56 | #define SETTINGS_OK2 BUTTON_LEFT |
57 | #define SETTINGS_CANCEL (BUTTON_MENU|BUTTON_REL) | 57 | #define SETTINGS_CANCEL BUTTON_MENU |
58 | 58 | ||
59 | #endif | 59 | #endif |
60 | 60 | ||
diff --git a/apps/tree.h b/apps/tree.h index 398c676f05..4b3406416f 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define TREE_EXIT BUTTON_LEFT | 27 | #define TREE_EXIT BUTTON_LEFT |
28 | #define TREE_ENTER BUTTON_RIGHT | 28 | #define TREE_ENTER BUTTON_RIGHT |
29 | #define TREE_RUN BUTTON_PLAY | 29 | #define TREE_RUN BUTTON_PLAY |
30 | #define TREE_MENU (BUTTON_F1 | BUTTON_REL) | 30 | #define TREE_MENU BUTTON_F1 |
31 | #define TREE_SHIFT BUTTON_ON | 31 | #define TREE_SHIFT BUTTON_ON |
32 | #define TREE_OFF BUTTON_OFF | 32 | #define TREE_OFF BUTTON_OFF |
33 | 33 | ||
@@ -43,7 +43,7 @@ | |||
43 | #define TREE_EXIT BUTTON_STOP | 43 | #define TREE_EXIT BUTTON_STOP |
44 | #define TREE_ENTER BUTTON_PLAY | 44 | #define TREE_ENTER BUTTON_PLAY |
45 | #define TREE_RUN BUTTON_PLAY | 45 | #define TREE_RUN BUTTON_PLAY |
46 | #define TREE_MENU (BUTTON_MENU | BUTTON_REL) | 46 | #define TREE_MENU BUTTON_MENU |
47 | #define TREE_SHIFT BUTTON_ON | 47 | #define TREE_SHIFT BUTTON_ON |
48 | 48 | ||
49 | #define TREE_RC_NEXT BUTTON_RC_RIGHT | 49 | #define TREE_RC_NEXT BUTTON_RC_RIGHT |
diff --git a/apps/wps.c b/apps/wps.c index e93b20d141..4a1a6f9b02 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -75,6 +75,7 @@ static char current_track_path[MAX_PATH+1]; | |||
75 | #define WPS_MENU (BUTTON_F1 | BUTTON_REL) | 75 | #define WPS_MENU (BUTTON_F1 | BUTTON_REL) |
76 | #define WPS_MENU_PRE BUTTON_F1 | 76 | #define WPS_MENU_PRE BUTTON_F1 |
77 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) | 77 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) |
78 | #define WPS_BROWSE_PRE BUTTON_ON | ||
78 | #define WPS_EXIT BUTTON_OFF | 79 | #define WPS_EXIT BUTTON_OFF |
79 | #define WPS_KEYLOCK (BUTTON_F1 | BUTTON_DOWN) | 80 | #define WPS_KEYLOCK (BUTTON_F1 | BUTTON_DOWN) |
80 | #define WPS_ID3 (BUTTON_F1 | BUTTON_ON) | 81 | #define WPS_ID3 (BUTTON_F1 | BUTTON_ON) |
@@ -99,6 +100,7 @@ static char current_track_path[MAX_PATH+1]; | |||
99 | #define WPS_MENU (BUTTON_MENU | BUTTON_REL) | 100 | #define WPS_MENU (BUTTON_MENU | BUTTON_REL) |
100 | #define WPS_MENU_PRE BUTTON_MENU | 101 | #define WPS_MENU_PRE BUTTON_MENU |
101 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) | 102 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) |
103 | #define WPS_BROWSE_PRE BUTTON_ON | ||
102 | #define WPS_EXIT BUTTON_STOP | 104 | #define WPS_EXIT BUTTON_STOP |
103 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_STOP) | 105 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_STOP) |
104 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) | 106 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) |
@@ -122,6 +124,7 @@ static char current_track_path[MAX_PATH+1]; | |||
122 | #define WPS_PAUSE BUTTON_OFF | 124 | #define WPS_PAUSE BUTTON_OFF |
123 | #define WPS_MENU (BUTTON_MENU | BUTTON_REPEAT) | 125 | #define WPS_MENU (BUTTON_MENU | BUTTON_REPEAT) |
124 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) | 126 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) |
127 | #define WPS_BROWSE_PRE BUTTON_MENU | ||
125 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 128 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
126 | 129 | ||
127 | #endif | 130 | #endif |
@@ -530,6 +533,10 @@ int wps_show(void) | |||
530 | switch(button) | 533 | switch(button) |
531 | { | 534 | { |
532 | case WPS_BROWSE: | 535 | case WPS_BROWSE: |
536 | #ifdef WPS_BROWSE_PRE | ||
537 | if (lastbutton != WPS_BROWSE_PRE) | ||
538 | break; | ||
539 | #endif | ||
533 | #ifdef HAVE_LCD_CHARCELLS | 540 | #ifdef HAVE_LCD_CHARCELLS |
534 | status_set_record(false); | 541 | status_set_record(false); |
535 | status_set_audio(false); | 542 | status_set_audio(false); |