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[]  = {
 }; /* button_context_keyboard */
 
 const struct button_mapping button_context_recscreen[]  = {
-    { ACTION_REC_PAUSE,             BUTTON_PLAY,                BUTTON_NONE },
     
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+    { ACTION_REC_NEWFILE,        BUTTON_PLAY|BUTTON_REPEAT,         BUTTON_PLAY },      
+    { ACTION_STD_CANCEL,         BUTTON_MENU|BUTTON_REL,            BUTTON_MENU },
+    { ACTION_STD_MENU,           BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
+    { ACTION_REC_PAUSE,          BUTTON_PLAY|BUTTON_REL,            BUTTON_PLAY },
+    { ACTION_STD_NEXT,           BUTTON_SCROLL_FWD,                 BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_SCROLL_FWD|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_SCROLL_BACK,                BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_LEFT,                       BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_LEFT|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_RIGHT,                      BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_NONE },      
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_recscreen */
 
 /* 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:
     \ActionRecExit  & Exit \setting{Recording Screen}.\\
                     & While recording: Stop recording.\\
     %
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,IPOD_4G_PAD}{
       \ActionRecNewfile & Starts recording.\\
                         & While recording: close the current file and open
                           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 @@
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonPlay}
-\newcommand{\ActionRecMenu}{\fixme{fixme}}
+\newcommand{\ActionRecExit}{\ButtonMenu}
+\newcommand{\ActionRecMenu}{Long \ButtonSelect}
+\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
-
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 @@
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonPlay}
-\newcommand{\ActionRecMenu}{\fixme{fixme}}
+\newcommand{\ActionRecExit}{\ButtonMenu}
+\newcommand{\ActionRecMenu}{Long \ButtonSelect}
+\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
-
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 @@
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonPlay}
-\newcommand{\ActionRecMenu}{\fixme{fixme}}
+\newcommand{\ActionRecExit}{\ButtonMenu}
+\newcommand{\ActionRecMenu}{Long \ButtonSelect}
+\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
-
+\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
\ No newline at end of file
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 @@
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonPlay}
-\newcommand{\ActionRecMenu}{\fixme{fixme}}
+\newcommand{\ActionRecExit}{\ButtonMenu}
+\newcommand{\ActionRecMenu}{Long \ButtonSelect}
+\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
 \newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
\ No newline at end of file