diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2004-10-14 07:48:49 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2004-10-14 07:48:49 +0000 |
| commit | 87ab7a07a660b82f3f9961a4030fb2b7b6212468 (patch) | |
| tree | 49714f0d0369bab4b9da7dda06afacecf93fcb35 | |
| parent | ba0a797b16b26413cabc844dbacf10e91d5a2ec7 (diff) | |
| download | rockbox-87ab7a07a660b82f3f9961a4030fb2b7b6212468.zip rockbox-87ab7a07a660b82f3f9961a4030fb2b7b6212468.tar.gz rockbox-87ab7a07a660b82f3f9961a4030fb2b7b6212468.tar.bz2 rockbox-87ab7a07a660b82f3f9961a4030fb2b7b6212468.tar.xz | |
Proper fix for TREE_RUN trailing release event
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5273 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/tree.c | 9 | ||||
| -rw-r--r-- | apps/tree.h | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/apps/tree.c b/apps/tree.c index 03c7d2c..1025306 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -868,10 +868,6 @@ static bool dirbrowse(const char *root, const int *dirfilter) button = button_get_w_tmo(HZ/5); - /* ignore leftover release event */ - if (!lastbutton && (button & BUTTON_REL)) - continue; - #ifndef SIMULATOR if (boot_changed) { bool stop = false; @@ -981,6 +977,11 @@ static bool dirbrowse(const char *root, const int *dirfilter) case TREE_RC_ENTER: #endif case TREE_RUN: +#ifdef TREE_RUN_PRE + if ((button == TREE_RUN) && + (lastbutton != TREE_RUN_PRE)) + break; +#endif if ( !numentries ) break; if (currdir[1]) diff --git a/apps/tree.h b/apps/tree.h index 10c93a4..297d611 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -27,6 +27,7 @@ #define TREE_EXIT BUTTON_LEFT #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) +#define TREE_RUN_PRE BUTTON_PLAY #define TREE_MENU BUTTON_F1 #define TREE_OFF BUTTON_OFF #define TREE_WPS (BUTTON_ON | BUTTON_REL) @@ -47,6 +48,7 @@ #define TREE_PREV BUTTON_LEFT #define TREE_EXIT BUTTON_STOP #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) +#define TREE_RUN_PRE BUTTON_PLAY #define TREE_MENU BUTTON_MENU #define TREE_WPS (BUTTON_ON | BUTTON_REL) #define TREE_WPS_PRE BUTTON_ON @@ -64,6 +66,7 @@ #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) +#define TREE_RUN_PRE BUTTON_RIGHT #define TREE_MENU (BUTTON_MENU | BUTTON_REPEAT) #define TREE_WPS (BUTTON_MENU | BUTTON_REL) #define TREE_WPS_PRE BUTTON_MENU |