summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-02-20 17:48:43 +0000
committerJens Arnold <amiconn@rockbox.org>2009-02-20 17:48:43 +0000
commit5c5b06ba39d2f00d70baef66a90c9e3d6c497817 (patch)
tree190c259db1a0411857db4b530d7a98e4d55f5e1b
parent3e67e3b1f06488f67d2ebbf844ff40893cc16bf0 (diff)
downloadrockbox-5c5b06ba39d2f00d70baef66a90c9e3d6c497817.tar.gz
rockbox-5c5b06ba39d2f00d70baef66a90c9e3d6c497817.tar.bz2
rockbox-5c5b06ba39d2f00d70baef66a90c9e3d6c497817.zip
Simplify the bookmark delete action. Combos don't need precondition checking. Also make this combo work in the bookmark screen if ON is pressed first. ON on its own is one of the OK actions in the chained context on these targets, so it must be suppressed here.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20066 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-av300.c4
-rw-r--r--apps/keymaps/keymap-player.c4
-rw-r--r--apps/keymaps/keymap-recorder.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index e528b9f311..6c91499a50 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -199,8 +199,8 @@ static const struct button_mapping button_context_keyboard[] = {
}; /* button_context_keyboard */
static const struct button_mapping button_context_bmark[] = {
- { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_SELECT },
- { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_ON },
+ { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 45fb2ebfbb..82362ecedb 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -89,8 +89,8 @@ static const struct button_mapping button_context_yesno[] = {
}; /* button_context_settings_yesno */
static const struct button_mapping button_context_bmark[] = {
- { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
- { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
+ { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 040aed65ac..08c1213fa4 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -201,8 +201,8 @@ static const struct button_mapping button_context_keyboard[] = {
}; /* button_context_keyboard */
static const struct button_mapping button_context_bmark[] = {
- { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
- { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
+ { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),