Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
pitchscreen: adjust keymaps for ipod and fiiom3k
ipod:
- To be more consistent with other plugins and
(Settings) menus, press Long Select, instead of Menu,
to reset, and press Menu, or Select, to exit screen
fiiom3k:
- Press Back, or Select, to exit screen
- Press Menu, instead of Select, to switch between modes
- Use repeat button events and adjust values by 1%, instead of
by 0.1%, when scrolling, to speed up setting changes
- Get rid of surprising actions for Back/Menu/Volume buttons
Change-Id: Ifd16958bf56c7e20fb182aa157b4cb4dd19ac9b9
+28
-24
+11
-8
apps/keymaps/keymap-fiiom3k.c
+11
-8
apps/keymaps/keymap-fiiom3k.c
···
185
185
186
186
static const struct button_mapping button_context_pitchscreen[] = {
187
187
{ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE},
188
-
{ACTION_PS_INC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE},
189
-
{ACTION_PS_INC_BIG, BUTTON_VOL_UP, BUTTON_NONE},
188
+
{ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE},
189
+
{ACTION_PS_INC_BIG, BUTTON_SCROLL_BACK, BUTTON_NONE},
190
+
{ACTION_PS_INC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
190
191
{ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE},
191
-
{ACTION_PS_DEC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE},
192
-
{ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN, BUTTON_NONE},
192
+
{ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE},
193
+
{ACTION_PS_DEC_BIG, BUTTON_SCROLL_FWD, BUTTON_NONE},
194
+
{ACTION_PS_DEC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
193
195
{ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE},
194
196
{ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
195
197
{ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE},
196
198
{ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE},
197
-
{ACTION_PS_TOGGLE_MODE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
199
+
{ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE},
200
+
{ACTION_PS_EXIT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
198
201
{ACTION_PS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
199
-
{ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE},
200
-
{ACTION_PS_FASTER, BUTTON_BACK, BUTTON_NONE},
201
-
{ACTION_PS_SLOWER, BUTTON_MENU, BUTTON_NONE},
202
+
{ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE},
203
+
{ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
204
+
{ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
202
205
LAST_ITEM_IN_LIST
203
206
}; /* button_context_pitchscreen */
204
207
+3
-2
apps/keymaps/keymap-ipod.c
+3
-2
apps/keymaps/keymap-ipod.c
···
151
151
{ ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
152
152
{ ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
153
153
{ ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE },
154
-
{ ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE },
155
-
{ ACTION_PS_EXIT, BUTTON_SELECT, BUTTON_NONE },
154
+
{ ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE },
155
+
{ ACTION_PS_EXIT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
156
+
{ ACTION_PS_RESET, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT},
156
157
{ ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
157
158
{ ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
158
159
+8
-8
manual/platform/keymap-fiiom3k.tex
+8
-8
manual/platform/keymap-fiiom3k.tex
···
78
78
\newcommand{\ActionKbdAbort}{\ButtonPower}
79
79
80
80
%Button actions, Pitch Screen context
81
-
\newcommand{\ActionPsToggleMode}{\ButtonSelect}
82
-
\newcommand{\ActionPsIncSmall}{\ButtonUp{} or \ButtonScrollBack}
83
-
\newcommand{\ActionPsDecSmall}{\ButtonDown{} or \ButtonScrollFwd}
84
-
\newcommand{\ActionPsIncBig}{\ButtonVolUp}
85
-
\newcommand{\ActionPsDecBig}{\ButtonVolDown}
81
+
\newcommand{\ActionPsToggleMode}{\ButtonMenu}
82
+
\newcommand{\ActionPsIncSmall}{\ButtonUp}
83
+
\newcommand{\ActionPsDecSmall}{\ButtonDown}
84
+
\newcommand{\ActionPsIncBig}{Long \ButtonUp{} or \ButtonScrollBack}
85
+
\newcommand{\ActionPsDecBig}{Long \ButtonDown {} or \ButtonScrollFwd}
86
86
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
87
87
\newcommand{\ActionPsNudgeRight}{\ButtonRight}
88
88
\newcommand{\ActionPsReset}{Long \ButtonSelect}
89
-
\newcommand{\ActionPsExit}{\ButtonPower}
90
-
\newcommand{\ActionPsFaster}{\ButtonBack}
91
-
\newcommand{\ActionPsSlower}{\ButtonMenu}
89
+
\newcommand{\ActionPsExit}{\ButtonBack{} or \ButtonSelect}
90
+
\newcommand{\ActionPsFaster}{Long \ButtonRight}
91
+
\newcommand{\ActionPsSlower}{Long \ButtonLeft}
92
92
93
93
%Button actions, Bookmark screen context
94
94
\newcommand{\ActionBmDelete}{\ButtonPlay}
+2
-2
manual/platform/keymap-ipod1g2g.tex
+2
-2
manual/platform/keymap-ipod1g2g.tex
···
77
77
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
78
78
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
79
79
\newcommand{\ActionPsNudgeRight}{\ButtonRight}
80
-
\newcommand{\ActionPsReset}{\ButtonMenu}
81
-
\newcommand{\ActionPsExit}{\ButtonSelect}
80
+
\newcommand{\ActionPsReset}{Long \ButtonSelect}
81
+
\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
82
82
83
83
%Button actions, Bookmark screen context
84
84
\newcommand{\ActionBmDelete}{Long \ButtonMenu}
+2
-2
manual/platform/keymap-ipod3g.tex
+2
-2
manual/platform/keymap-ipod3g.tex
···
77
77
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
78
78
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
79
79
\newcommand{\ActionPsNudgeRight}{\ButtonRight}
80
-
\newcommand{\ActionPsReset}{\ButtonMenu}
81
-
\newcommand{\ActionPsExit}{\ButtonSelect}
80
+
\newcommand{\ActionPsReset}{Long \ButtonSelect}
81
+
\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
82
82
83
83
%Button actions, Bookmark screen context
84
84
\newcommand{\ActionBmDelete}{Long \ButtonMenu}
+2
-2
manual/platform/keymap-ipod4g.tex
+2
-2
manual/platform/keymap-ipod4g.tex
···
78
78
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
79
79
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
80
80
\newcommand{\ActionPsNudgeRight}{\ButtonRight}
81
-
\newcommand{\ActionPsReset}{\ButtonMenu}
82
-
\newcommand{\ActionPsExit}{\ButtonSelect}
81
+
\newcommand{\ActionPsReset}{Long \ButtonSelect}
82
+
\newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
83
83
84
84
%Button actions, Recording screen context
85
85
\newcommand{\ActionRecPause}{\ButtonPlay}