From c9786650258e969deb695d26c4be601ac79eba64 Mon Sep 17 00:00:00 2001 From: Jean-Louis Biasini Date: Thu, 9 Feb 2012 14:54:44 +0100 Subject: [PATCH] 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 Reviewed-by: Amaury Pouly --- apps/plugins/lib/pluginlib_actions.c | 4 ++-- 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[] = {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, - {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, + {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, @@ -409,7 +409,7 @@ const struct button_mapping pla_main_ctx[] = {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, - {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, + {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {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 @@ \newcommand{\PluginLeftRepeat}{Long \ButtonLeft} \newcommand{\PluginRightRepeat}{Long \ButtonRight} -\newcommand{\PluginCancel}{\ButtonPower} -\newcommand{\PluginExit}{Long \ButtonPower} +\newcommand{\PluginCancel}{\ButtonBack} +\newcommand{\PluginExit}{\ButtonPower} \newcommand{\PluginSelect}{\ButtonSelect} \newcommand{\PluginSelectRepeat}{Long \ButtonSelect}