summaryrefslogtreecommitdiffstats
path: root/apps/action.h
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-04-08 01:33:01 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-04-08 01:33:01 +0000
commita053e58894292e1f12e4af578b9948da9cbdf76c (patch)
treed33f0888cb551dff27088c872065f338f3648f04 /apps/action.h
parenteef96946e1e962473e9049005eec2b2d0b2f8463 (diff)
downloadrockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.tar.gz
rockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.tar.bz2
rockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.zip
minor actions cleanup:
- CONTEXT_MAINMENU is not actually needed, use CONTEXT_TREE which does the same actions - (gigabeat) use vol+/- in the lists to control volume (every list!) (FS#6982 in a better way) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13062 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/action.h')
-rw-r--r--apps/action.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/action.h b/apps/action.h
index 7f476a8a88..29023720cc 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -44,7 +44,7 @@ enum {
CONTEXT_WPS = 1,
CONTEXT_TREE = 2,
CONTEXT_RECORD = 3,
- CONTEXT_MAINMENU = 4,
+ CONTEXT_MAINMENU = 4, /* uses CONTEXT_TREE and ACTION_TREE_* */
CONTEXT_ID3DB = 5,
/* Add new contexts here, no need to explicitly define a value for them */
CONTEXT_LIST,
@@ -123,6 +123,10 @@ enum {
/* list and tree page up/down */
ACTION_LISTTREE_PGUP,/* optional */
ACTION_LISTTREE_PGDOWN,/* optional */
+#ifdef HAVE_VOLUME_IN_LIST
+ ACTION_LIST_VOLUP,
+ ACTION_LIST_VOLDOWN,
+#endif
/* tree */
ACTION_TREE_ROOT_INIT,
@@ -152,13 +156,13 @@ enum {
ACTION_REC_F3,
/* main menu */
+ /* These are not strictly actions, but must be here
+ so they dont conflict with real actions in the menu code */
ACTION_REQUEST_MENUITEM,
ACTION_EXIT_MENUITEM,
ACTION_EXIT_AFTER_THIS_MENUITEM, /* if a menu returns this the menu will exit
once the subitem returns */
ACTION_ENTER_MENUITEM,
- ACTION_MENU_WPS,
- ACTION_MENU_STOP,
/* id3db */