summaryrefslogtreecommitdiff
path: root/apps/keymaps
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2007-05-26 10:44:38 +0000
committerMagnus Holmgren <magnushol@gmail.com>2007-05-26 10:44:38 +0000
commite676b814e88922f361e91181b3d299931b03ff67 (patch)
tree72e4fa0cdbf814c79f13590067036c00d410c439 /apps/keymaps
parent1186c18c3aed23b8c0d2964084b33bf40ab4ae86 (diff)
downloadrockbox-e676b814e88922f361e91181b3d299931b03ff67.zip
rockbox-e676b814e88922f361e91181b3d299931b03ff67.tar.gz
rockbox-e676b814e88922f361e91181b3d299931b03ff67.tar.bz2
rockbox-e676b814e88922f361e91181b3d299931b03ff67.tar.xz
FS#7158 - Bookmark selection as a list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13495 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r--apps/keymaps/keymap-av300.c4
-rw-r--r--apps/keymaps/keymap-e200.c4
-rw-r--r--apps/keymaps/keymap-gigabeat.c12
-rw-r--r--apps/keymaps/keymap-h10.c4
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c14
-rw-r--r--apps/keymaps/keymap-ifp7xx.c3
-rw-r--r--apps/keymaps/keymap-ipod.c4
-rw-r--r--apps/keymaps/keymap-ondio.c4
-rw-r--r--apps/keymaps/keymap-player.c4
-rw-r--r--apps/keymaps/keymap-recorder.c4
-rw-r--r--apps/keymaps/keymap-x5.c4
11 files changed, 19 insertions, 42 deletions
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index e451d70..552fc2a 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -198,10 +198,8 @@ static const struct button_mapping 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_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index c946b5f..280837b 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -219,10 +219,8 @@ static const struct button_mapping button_context_keyboard[] = {
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_bmark */
/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index c2e6a53..465d16a 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -192,27 +192,25 @@ static const struct button_mapping button_context_yesno[] = {
static const struct button_mapping button_context_colorchooser[] = {
{ ACTION_STD_OK, BUTTON_A|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_colorchooser */
static const struct button_mapping button_context_eq[] = {
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_eq */
/** Bookmark Screen **/
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_A, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
static const struct button_mapping button_context_time[] = {
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_A, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 1a3c81b..7eb6b8d 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -296,9 +296,7 @@ static const struct button_mapping button_context_keyboard[] = {
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_REW, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_LEFT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_bmark */
const struct button_mapping button_context_recscreen[] = {
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index bbec420..144b788 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -174,7 +174,7 @@ static const struct button_mapping button_context_yesno[] = {
static const struct button_mapping button_context_colorchooser[] = {
{ ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_settings_colorchooser */
static const struct button_mapping button_context_eq[] = {
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
@@ -186,13 +186,11 @@ static const struct button_mapping button_context_eq[] = {
{ ACTION_SETTINGS_DECBIGSTEP, BUTTON_LEFT|BUTTON_REL, BUTTON_ON|BUTTON_LEFT },
{ ACTION_SETTINGS_DECBIGSTEP, BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_settings_context_eq */
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_time[] = {
@@ -493,11 +491,9 @@ static const struct button_mapping button_context_yesno_h100remote[] = {
static const struct button_mapping *button_context_yesno_h300lcdremote =
button_context_yesno_h100remote;
-static const struct button_mapping button_context_bmark_h100remote[] = {
+static const struct button_mapping button_context_bmark_h100remote[] = {
{ ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_RC_MENU, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_RC_STOP, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
}; /* button_context_settings_bmark */
static const struct button_mapping *button_context_bmark_h300lcdremote =
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index 93de23b..64c8908 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -102,8 +102,7 @@ static const struct button_mapping button_context_yesno[] = {
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE },
- { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_quickscreen[] = {
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 4e0fc1b..b05db02 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -117,9 +117,7 @@ static const struct button_mapping button_context_yesno[] = {
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
- { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_PLAY, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_quickscreen[] = {
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 506444e..10a27ca 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -113,10 +113,8 @@ static const struct button_mapping button_context_yesno[] = {
static const struct button_mapping button_context_bmark[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
- { ACTION_BMS_EXIT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
- { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_pitchscreen[] = {
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 1c0536d..1062a23 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -88,10 +88,8 @@ static const struct button_mapping button_context_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_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ 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 3dd8bbd..73fdbf0 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -199,10 +199,8 @@ static const struct button_mapping 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_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
- { ACTION_BMS_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index b637e1d..e585751 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -76,10 +76,8 @@ static const struct button_mapping remote_button_context_standard[] = {
/** Bookmark Screen **/
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
- { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_REC },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */
/** FM Radio Screen **/
generated by cgit v1.1 at 2026-05-09 08:01:52 +0000