diff options
Diffstat (limited to 'apps/keymaps/keymap-fiiom3k.c')
| -rw-r--r-- | apps/keymaps/keymap-fiiom3k.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c index d0fbbb2e98..1ccf7e956f 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3k.c @@ -175,7 +175,8 @@ static const struct button_mapping button_context_quickscreen[] = { {ACTION_QS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, {ACTION_QS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE}, {ACTION_QS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, - {ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE}, + {ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, + {ACTION_STD_CANCEL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, {ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE}, {ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE}, @@ -214,10 +215,8 @@ static const struct button_mapping button_context_yesnoscreen[] = { }; /* button_context_yesnoscreen */ static const struct button_mapping button_context_recscreen[] = { - {ACTION_REC_PAUSE, BUTTON_SELECT, BUTTON_NONE}, {ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE}, - {ACTION_REC_NEWFILE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, - {ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, + {ACTION_REC_NEWFILE, BUTTON_SELECT, BUTTON_NONE}, {ACTION_STD_MENU, BUTTON_MENU, BUTTON_NONE}, {ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE}, {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, @@ -323,21 +322,14 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { const struct button_mapping* get_context_mapping(int context) { - switch (context) - { - case CONTEXT_WPS|CONTEXT_LOCKED: - return button_context_wps_locked; - default: - context &= ~CONTEXT_LOCKED; - break; - } - - switch (context) + switch (context & ~CONTEXT_LOCKED) { default: case CONTEXT_STD: return button_context_standard; case CONTEXT_WPS: + if (context & CONTEXT_LOCKED) + return button_context_wps_locked; return button_context_wps; case CONTEXT_TREE: case CONTEXT_MAINMENU: |