diff options
author | Jean-Louis Biasini <jlbiasini@gmail.com> | 2012-02-09 14:54:44 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-02-09 16:43:53 +0100 |
commit | c9786650258e969deb695d26c4be601ac79eba64 (patch) | |
tree | 8596dfa6937aa67fd0a6afe4ec72a3fe405b34f1 | |
parent | 4d72c1b0b4155e58ab89a5452f10b722002c1055 (diff) | |
download | rockbox-c9786650258e969deb695d26c4be601ac79eba64.tar.gz rockbox-c9786650258e969deb695d26c4be601ac79eba64.zip |
Fuze+ PLA_EXIT slight mapping cleanup
1) On all non PLA plugin, power button is used for exit. For consistency,
we set PLA_EXIT to power button.
2) Manual updated accordingly
Change-Id: Ia4b8fce13bad2f8dc0710cdb29ccf6c74b3fd9c4
Reviewed-on: http://gerrit.rockbox.org/91
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 4 | ||||
-rw-r--r-- | manual/platform/keymap-sansafuzeplus.tex | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 7f8c11a34e..e22665e8e5 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -397,7 +397,7 @@ const struct button_mapping pla_main_ctx[] = | |||
397 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, | 397 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, |
398 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 398 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
399 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, | 399 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, |
400 | {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 400 | {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
401 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, | 401 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, |
402 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, | 402 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, |
403 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, | 403 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -409,7 +409,7 @@ const struct button_mapping pla_main_ctx[] = | |||
409 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 409 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
410 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | 410 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) |
411 | {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, | 411 | {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, |
412 | {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, | 412 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, |
413 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 413 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, |
414 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 414 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
415 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 415 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/manual/platform/keymap-sansafuzeplus.tex b/manual/platform/keymap-sansafuzeplus.tex index 69dc23b7e3..1266f2604a 100644 --- a/manual/platform/keymap-sansafuzeplus.tex +++ b/manual/platform/keymap-sansafuzeplus.tex | |||
@@ -147,8 +147,8 @@ | |||
147 | \newcommand{\PluginLeftRepeat}{Long \ButtonLeft} | 147 | \newcommand{\PluginLeftRepeat}{Long \ButtonLeft} |
148 | \newcommand{\PluginRightRepeat}{Long \ButtonRight} | 148 | \newcommand{\PluginRightRepeat}{Long \ButtonRight} |
149 | 149 | ||
150 | \newcommand{\PluginCancel}{\ButtonPower} | 150 | \newcommand{\PluginCancel}{\ButtonBack} |
151 | \newcommand{\PluginExit}{Long \ButtonPower} | 151 | \newcommand{\PluginExit}{\ButtonPower} |
152 | \newcommand{\PluginSelect}{\ButtonSelect} | 152 | \newcommand{\PluginSelect}{\ButtonSelect} |
153 | \newcommand{\PluginSelectRepeat}{Long \ButtonSelect} | 153 | \newcommand{\PluginSelectRepeat}{Long \ButtonSelect} |
154 | 154 | ||