From b6a1ac98372162c5d5b134bcc8eb5fe351792f29 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 18 Jun 2010 22:42:35 +0000 Subject: clip recording keymap changes, thanks to dfkt git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26943 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-clip.c | 14 ++++++-------- manual/platform/keymap-sansaclip.tex | 12 ++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index a8766b5643..2a3d798d58 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c @@ -219,19 +219,17 @@ static const struct button_mapping button_context_pitchscreen[] = { #ifdef HAVE_RECORDING /** Recording Screen **/ static const struct button_mapping button_context_recscreen[] = { - { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_REC_PAUSE, BUTTON_SELECT, BUTTON_NONE }, { ACTION_REC_NEWFILE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - { ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, + { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, + { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ #endif diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex index 4c7feed012..91faea2d08 100644 --- a/manual/platform/keymap-sansaclip.tex +++ b/manual/platform/keymap-sansaclip.tex @@ -85,14 +85,14 @@ \newcommand{\ActionPsExit}{\ButtonPower{} or \ButtonUp} %Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonUp} -\newcommand{\ActionRecExit}{\ButtonDown} +\newcommand{\ActionRecPause}{\ButtonSelect} +\newcommand{\ActionRecExit}{\ButtonPower} \newcommand{\ActionRecNewfile}{\ButtonHome} -\newcommand{\ActionRecMenu}{Long \ButtonSelect} +\newcommand{\ActionRecMenu}{Long \ButtonDown} \newcommand{\ActionRecSettingsInc}{\ButtonRight} \newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonVolDown} -\newcommand{\ActionRecNext}{\ButtonVolUp} +\newcommand{\ActionRecPrev}{\ButtonDown} +\newcommand{\ActionRecNext}{\ButtonUp} %Button actions, FM radio context \newcommand{\ActionFMPreset}{\ButtonSelect} @@ -127,4 +127,4 @@ \newcommand{\PluginCancel}{\ButtonPower} \newcommand{\PluginExit}{Long \ButtonPower} \newcommand{\PluginSelect}{\ButtonSelect} -\newcommand{\PluginSelectRepeat}{Long \ButtonSelect} \ No newline at end of file +\newcommand{\PluginSelectRepeat}{Long \ButtonSelect} -- cgit v1.2.3