diff options
| author | Marcoen Hirschberg <marcoen@gmail.com> | 2005-06-12 20:18:37 +0000 |
|---|---|---|
| committer | Marcoen Hirschberg <marcoen@gmail.com> | 2005-06-12 20:18:37 +0000 |
| commit | fb369b063b5e7b633a41ff267ebdbc1176ca5d1d (patch) | |
| tree | e4164d1a1259dacf9d5f20aadd3e911f893dd876 /apps/tree.c | |
| parent | 7eb743e88178e98d17f68a5832ec1dfa3e279731 (diff) | |
Make remote-control code more complete
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6696 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.c')
| -rw-r--r-- | apps/tree.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/apps/tree.c b/apps/tree.c index da0e54c815..cba8b56a6d 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -468,9 +468,14 @@ static bool ask_resume(bool ask_once) #else case TREE_RUN: #endif + +#ifdef TREE_RC_RUN_PRE + case TREE_RC_RUN_PRE: /* catch the press, not the release */ +#else #ifdef TREE_RC_RUN case TREE_RC_RUN: #endif +#endif ignore_power = false; /* Don't ignore the power button for subsequent calls */ return true; @@ -722,6 +727,9 @@ static bool dirbrowse(void) button = button_get(true); switch (button) { case TREE_RUN: +#ifdef TREE_RC_RUN + case TREE_RC_RUN: +#endif rolo_load("/" BOOTFILE); stop = true; break; @@ -747,10 +755,17 @@ static bool dirbrowse(void) #ifdef TREE_RC_ENTER case TREE_RC_ENTER: #endif +#ifdef TREE_RC_RUN + case TREE_RC_RUN: +#endif case TREE_RUN: #ifdef TREE_RUN_PRE - if ((button == TREE_RUN) && - (lastbutton != TREE_RUN_PRE)) + if (((button == TREE_RUN) +#ifdef TREE_RC_RUN_PRE + || (button == TREE_RC_RUN)) + && ((lastbutton != TREE_RC_RUN_PRE) +#endif + && (lastbutton != TREE_RUN_PRE))) break; #endif if ( !numentries ) @@ -1014,8 +1029,15 @@ static bool dirbrowse(void) break; case TREE_WPS: +#ifdef TREE_RC_WPS + case TREE_RC_WPS: +#endif #ifdef TREE_WPS_PRE - if (lastbutton != TREE_WPS_PRE) + if ((lastbutton != TREE_WPS_PRE) +#ifdef TREE_RC_WPS + && (lastbutton != TREE_RC_WPS_PRE) +#endif + ) break; #endif /* don't enter wps from plugin browser etc */ @@ -1059,6 +1081,9 @@ static bool dirbrowse(void) #endif case TREE_CONTEXT: +#ifdef TREE_RC_CONTEXT + case TREE_RC_CONTEXT: +#endif #ifdef TREE_CONTEXT2 case TREE_CONTEXT2: #endif |