diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-08 01:33:01 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-08 01:33:01 +0000 |
commit | a053e58894292e1f12e4af578b9948da9cbdf76c (patch) | |
tree | d33f0888cb551dff27088c872065f338f3648f04 /apps/keymaps/keymap-h1x0_h3x0.c | |
parent | eef96946e1e962473e9049005eec2b2d0b2f8463 (diff) | |
download | rockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.tar.gz 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/keymaps/keymap-h1x0_h3x0.c')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 2640e8c336..b31ce6e6db 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -65,13 +65,6 @@ static const struct button_mapping button_context_standard[] = { | |||
65 | LAST_ITEM_IN_LIST | 65 | LAST_ITEM_IN_LIST |
66 | }; /* button_context_standard */ | 66 | }; /* button_context_standard */ |
67 | 67 | ||
68 | static const struct button_mapping button_context_menu[] = { | ||
69 | { ACTION_MENU_WPS, BUTTON_ON, BUTTON_NONE }, | ||
70 | { ACTION_MENU_STOP, BUTTON_OFF, BUTTON_NONE }, | ||
71 | |||
72 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
73 | }; /* button_context_menu */ | ||
74 | |||
75 | static const struct button_mapping button_context_wps[] = { | 68 | static const struct button_mapping button_context_wps[] = { |
76 | { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 69 | { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
77 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 70 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
@@ -721,17 +714,11 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = { | |||
721 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 714 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
722 | }; | 715 | }; |
723 | 716 | ||
724 | static const struct button_mapping button_context_menu_remote[] = { | ||
725 | { ACTION_MENU_WPS, BUTTON_RC_ON, BUTTON_NONE }, | ||
726 | |||
727 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) | ||
728 | }; | ||
729 | 717 | ||
730 | /* the actual used tables */ | 718 | /* the actual used tables */ |
731 | static const struct button_mapping | 719 | static const struct button_mapping |
732 | *remote_btn_ctxt_std = 0, | 720 | *remote_btn_ctxt_std = 0, |
733 | *remote_btn_ctxt_wps = 0, | 721 | *remote_btn_ctxt_wps = 0, |
734 | *remote_btn_ctxt_menu = button_context_menu_remote, | ||
735 | *remote_btn_ctxt_list = 0, | 722 | *remote_btn_ctxt_list = 0, |
736 | *remote_btn_ctxt_tree = 0, | 723 | *remote_btn_ctxt_tree = 0, |
737 | *remote_btn_ctxt_listtree_scroll_w_cmb = 0, | 724 | *remote_btn_ctxt_listtree_scroll_w_cmb = 0, |
@@ -880,8 +867,6 @@ static const struct button_mapping* get_context_mapping_remote(int context) | |||
880 | { | 867 | { |
881 | case CONTEXT_STD: | 868 | case CONTEXT_STD: |
882 | return remote_btn_ctxt_std; | 869 | return remote_btn_ctxt_std; |
883 | case CONTEXT_MAINMENU: | ||
884 | return remote_btn_ctxt_menu; | ||
885 | case CONTEXT_WPS: /* common for all remotes */ | 870 | case CONTEXT_WPS: /* common for all remotes */ |
886 | return button_context_wps_remotescommon; | 871 | return button_context_wps_remotescommon; |
887 | 872 | ||
@@ -891,6 +876,7 @@ static const struct button_mapping* get_context_mapping_remote(int context) | |||
891 | case CONTEXT_LIST: | 876 | case CONTEXT_LIST: |
892 | return remote_btn_ctxt_list; | 877 | return remote_btn_ctxt_list; |
893 | case CONTEXT_TREE: | 878 | case CONTEXT_TREE: |
879 | case CONTEXT_MAINMENU: | ||
894 | if (global_settings.hold_lr_for_scroll_in_list) | 880 | if (global_settings.hold_lr_for_scroll_in_list) |
895 | return remote_btn_ctxt_listtree_scroll_wo_cmb; | 881 | return remote_btn_ctxt_listtree_scroll_wo_cmb; |
896 | else | 882 | else |
@@ -929,14 +915,13 @@ const struct button_mapping* get_context_mapping(int context) | |||
929 | { | 915 | { |
930 | case CONTEXT_STD: | 916 | case CONTEXT_STD: |
931 | return button_context_standard; | 917 | return button_context_standard; |
932 | case CONTEXT_MAINMENU: | ||
933 | return button_context_menu; | ||
934 | case CONTEXT_WPS: | 918 | case CONTEXT_WPS: |
935 | return button_context_wps; | 919 | return button_context_wps; |
936 | 920 | ||
937 | case CONTEXT_LIST: | 921 | case CONTEXT_LIST: |
938 | return button_context_list; | 922 | return button_context_list; |
939 | case CONTEXT_TREE: | 923 | case CONTEXT_TREE: |
924 | case CONTEXT_MAINMENU: | ||
940 | if (global_settings.hold_lr_for_scroll_in_list) | 925 | if (global_settings.hold_lr_for_scroll_in_list) |
941 | return button_context_listtree_scroll_without_combo; | 926 | return button_context_listtree_scroll_without_combo; |
942 | else | 927 | else |