diff options
author | Marc Guay <marcguay@rockbox.org> | 2008-07-08 17:52:15 +0000 |
---|---|---|
committer | Marc Guay <marcguay@rockbox.org> | 2008-07-08 17:52:15 +0000 |
commit | a8af98f75099ffe6a65a1ab848f156dbcc9f875c (patch) | |
tree | 6a68422efc0fd718368b7fd6ace1c6fec62e8d02 | |
parent | 779c0eb5f09f3dd25392024faec266575a39db07 (diff) | |
download | rockbox-a8af98f75099ffe6a65a1ab848f156dbcc9f875c.tar.gz rockbox-a8af98f75099ffe6a65a1ab848f156dbcc9f875c.zip |
Update the iPod recording screen keymap and manual. FS#9165.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17989 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 16 | ||||
-rw-r--r-- | manual/main_menu/recording_screen.tex | 2 | ||||
-rw-r--r-- | manual/platform/ipod4g.tex | 6 | ||||
-rw-r--r-- | manual/platform/ipodcolor.tex | 6 | ||||
-rw-r--r-- | manual/platform/ipodnano.tex | 8 | ||||
-rw-r--r-- | manual/platform/ipodvideo.tex | 7 |
6 files changed, 29 insertions, 16 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 7d3c7216d9..79a7f8ee82 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -168,9 +168,21 @@ static const struct button_mapping button_context_keyboard[] = { | |||
168 | }; /* button_context_keyboard */ | 168 | }; /* button_context_keyboard */ |
169 | 169 | ||
170 | const struct button_mapping button_context_recscreen[] = { | 170 | const struct button_mapping button_context_recscreen[] = { |
171 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, | ||
172 | 171 | ||
173 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 172 | { ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
173 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
174 | { ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
175 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
176 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, | ||
177 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
178 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, | ||
179 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | ||
180 | { ACTION_SETTINGS_INC, BUTTON_LEFT, BUTTON_NONE }, | ||
181 | { ACTION_SETTINGS_INCREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
182 | { ACTION_SETTINGS_DEC, BUTTON_RIGHT, BUTTON_NONE }, | ||
183 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
184 | |||
185 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
174 | }; /* button_context_recscreen */ | 186 | }; /* button_context_recscreen */ |
175 | 187 | ||
176 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 188 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex index 278fc063cb..8fc7661741 100644 --- a/manual/main_menu/recording_screen.tex +++ b/manual/main_menu/recording_screen.tex | |||
@@ -37,7 +37,7 @@ The controls for this screen are: | |||
37 | \ActionRecExit & Exit \setting{Recording Screen}.\\ | 37 | \ActionRecExit & Exit \setting{Recording Screen}.\\ |
38 | & While recording: Stop recording.\\ | 38 | & While recording: Stop recording.\\ |
39 | % | 39 | % |
40 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{ | 40 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,IPOD_4G_PAD}{ |
41 | \ActionRecNewfile & Starts recording.\\ | 41 | \ActionRecNewfile & Starts recording.\\ |
42 | & While recording: close the current file and open | 42 | & While recording: close the current file and open |
43 | a new one.\\ | 43 | a new one.\\ |
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex index cae07d3cee..15ed313183 100644 --- a/manual/platform/ipod4g.tex +++ b/manual/platform/ipod4g.tex | |||
@@ -100,8 +100,8 @@ | |||
100 | 100 | ||
101 | %Button actions, Recording screen context | 101 | %Button actions, Recording screen context |
102 | \newcommand{\ActionRecPause}{\ButtonPlay} | 102 | \newcommand{\ActionRecPause}{\ButtonPlay} |
103 | \newcommand{\ActionRecExit}{Long \ButtonPlay} | 103 | \newcommand{\ActionRecExit}{\ButtonMenu} |
104 | \newcommand{\ActionRecMenu}{\fixme{fixme}} | 104 | \newcommand{\ActionRecMenu}{Long \ButtonSelect} |
105 | \newcommand{\ActionRecNewfile}{Long \ButtonPlay} | ||
105 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} | 106 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} |
106 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} | 107 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} |
107 | |||
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex index 832d2e1875..997234ab64 100644 --- a/manual/platform/ipodcolor.tex +++ b/manual/platform/ipodcolor.tex | |||
@@ -100,8 +100,8 @@ | |||
100 | 100 | ||
101 | %Button actions, Recording screen context | 101 | %Button actions, Recording screen context |
102 | \newcommand{\ActionRecPause}{\ButtonPlay} | 102 | \newcommand{\ActionRecPause}{\ButtonPlay} |
103 | \newcommand{\ActionRecExit}{Long \ButtonPlay} | 103 | \newcommand{\ActionRecExit}{\ButtonMenu} |
104 | \newcommand{\ActionRecMenu}{\fixme{fixme}} | 104 | \newcommand{\ActionRecMenu}{Long \ButtonSelect} |
105 | \newcommand{\ActionRecNewfile}{Long \ButtonPlay} | ||
105 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} | 106 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} |
106 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} | 107 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} |
107 | |||
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex index 4c51c86e59..8587503686 100644 --- a/manual/platform/ipodnano.tex +++ b/manual/platform/ipodnano.tex | |||
@@ -99,8 +99,8 @@ | |||
99 | 99 | ||
100 | %Button actions, Recording screen context | 100 | %Button actions, Recording screen context |
101 | \newcommand{\ActionRecPause}{\ButtonPlay} | 101 | \newcommand{\ActionRecPause}{\ButtonPlay} |
102 | \newcommand{\ActionRecExit}{Long \ButtonPlay} | 102 | \newcommand{\ActionRecExit}{\ButtonMenu} |
103 | \newcommand{\ActionRecMenu}{\fixme{fixme}} | 103 | \newcommand{\ActionRecMenu}{Long \ButtonSelect} |
104 | \newcommand{\ActionRecNewfile}{Long \ButtonPlay} | ||
104 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} | 105 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} |
105 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} | 106 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} \ No newline at end of file |
106 | |||
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex index e925e8d2f5..e1981b152d 100644 --- a/manual/platform/ipodvideo.tex +++ b/manual/platform/ipodvideo.tex | |||
@@ -101,7 +101,8 @@ | |||
101 | 101 | ||
102 | %Button actions, Recording screen context | 102 | %Button actions, Recording screen context |
103 | \newcommand{\ActionRecPause}{\ButtonPlay} | 103 | \newcommand{\ActionRecPause}{\ButtonPlay} |
104 | \newcommand{\ActionRecExit}{Long \ButtonPlay} | 104 | \newcommand{\ActionRecExit}{\ButtonMenu} |
105 | \newcommand{\ActionRecMenu}{\fixme{fixme}} | 105 | \newcommand{\ActionRecMenu}{Long \ButtonSelect} |
106 | \newcommand{\ActionRecNewfile}{Long \ButtonPlay} | ||
106 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} | 107 | \newcommand{\ActionRecSettingsInc}{\ActionSettingInc} |
107 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} | 108 | \newcommand{\ActionRecSettingsDec}{\ActionSettingDec} \ No newline at end of file |