summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/keymaps/keymap-h10.c9
-rw-r--r--manual/main_menu/recording_screen.tex5
-rw-r--r--manual/platform/c200.tex2
-rw-r--r--manual/platform/e200.tex2
-rw-r--r--manual/platform/h10.tex3
-rw-r--r--manual/platform/h10_5gb.tex3
-rw-r--r--manual/platform/h1xx.tex2
-rw-r--r--manual/platform/h300.tex2
-rw-r--r--manual/platform/ipod4g.tex6
-rw-r--r--manual/platform/ipodcolor.tex6
-rw-r--r--manual/platform/ipodnano.tex6
-rw-r--r--manual/platform/ipodvideo.tex6
-rw-r--r--manual/platform/m5.tex2
-rw-r--r--manual/platform/ondiofm.tex2
-rw-r--r--manual/platform/recorder.tex2
-rw-r--r--manual/platform/recorderv2fm.tex2
-rw-r--r--manual/platform/x5.tex2
17 files changed, 50 insertions, 12 deletions
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index df4c225ccd..d0d5a43e48 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -302,8 +302,13 @@ static const struct button_mapping button_context_bmark[] = {
}; /* button_context_bmark */
const struct button_mapping button_context_recscreen[] = {
- { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
-
+ { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
+ { ACTION_REC_NEWFILE, BUTTON_SELECT, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE },
+ { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_FF, BUTTON_NONE },
+ { ACTION_STD_NEXTREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_recscreen */
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index 8fc7661741..05aa73ee71 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -26,7 +26,7 @@ The controls for this screen are:
\begin{table}
\begin{btnmap}{}{}
- \ActionStdPrev{} / \ActionStdNext & Select setting.\\
+ \ActionRecPrev{} / \ActionRecNext & Select setting.\\
%
\ActionRecSettingsDec{} / \ActionRecSettingsInc & Adjust selected setting.\\
%
@@ -37,7 +37,8 @@ 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,IPOD_4G_PAD}{
+ \opt{IRIVER_H10_PAD,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/c200.tex b/manual/platform/c200.tex
index e459754664..e6d8cd1498 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/c200.tex
@@ -111,6 +111,8 @@
\newcommand{\ActionRecMenu}{Long \ButtonDown}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonDown}
+\newcommand{\ActionRecNext}{\ButtonUp}
\newcommand{\ActionQuickscreenExit}{\ButtonPower}
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 48cf8c946e..1f1a7b1286 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -111,6 +111,8 @@
\newcommand{\ActionRecMenu}{\ButtonDown}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonScrollBack}
+\newcommand{\ActionRecNext}{\ButtonScrollFwd}
%Button actions, FM radio context
\newcommand{\ActionFMPreset}{\ButtonSelect}
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index 79f918c458..ffdd6f8115 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/h10.tex
@@ -120,8 +120,11 @@
%Button actions, Recording screen context
\newcommand{\ActionRecPause}{\ButtonPlay}
+\newcommand{\ActionRecNewfile}{\ButtonSelect}
\newcommand{\ActionRecExit}{\ButtonLeft}
\newcommand{\ActionRecMenu}{\ButtonPower}
\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+\newcommand{\ActionRecPrev}{\ButtonRew}
+\newcommand{\ActionRecNext}{\ButtonFF}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index b73920c233..1ffef713a2 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/h10_5gb.tex
@@ -120,8 +120,11 @@
%Button actions, Recording screen context
\newcommand{\ActionRecPause}{\ButtonPlay}
+\newcommand{\ActionRecNewfile}{\ButtonSelect}
\newcommand{\ActionRecExit}{\ButtonLeft}
\newcommand{\ActionRecMenu}{\ButtonPower}
\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+\newcommand{\ActionRecPrev}{\ButtonRew}
+\newcommand{\ActionRecNext}{\ButtonFF}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 7b7ed397f0..96377c3c1d 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -108,6 +108,8 @@
\newcommand{\ActionRecNewfile}{\ButtonRec}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{\ButtonMode}
\newcommand{\ActionRecExit}{\ButtonOff}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 78ab41b008..a78edda3c1 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -109,6 +109,8 @@
\newcommand{\ActionRecNewfile}{\ButtonRec}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{\ButtonMode}
\newcommand{\ActionRecExit}{\ButtonOff}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 15ed313183..88c1991b9b 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -103,5 +103,7 @@
\newcommand{\ActionRecExit}{\ButtonMenu}
\newcommand{\ActionRecMenu}{Long \ButtonSelect}
\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
-\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+\newcommand{\ActionRecSettingsInc}{\ButtonRight}
+\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonScrollBack}
+\newcommand{\ActionRecNext}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 997234ab64..edbee76de5 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -103,5 +103,7 @@
\newcommand{\ActionRecExit}{\ButtonMenu}
\newcommand{\ActionRecMenu}{Long \ButtonSelect}
\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
-\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec}
+\newcommand{\ActionRecSettingsInc}{\ButtonRight}
+\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonScrollBack}
+\newcommand{\ActionRecNext}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 8587503686..ca0eac4ed6 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -102,5 +102,7 @@
\newcommand{\ActionRecExit}{\ButtonMenu}
\newcommand{\ActionRecMenu}{Long \ButtonSelect}
\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
-\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec} \ No newline at end of file
+\newcommand{\ActionRecSettingsInc}{\ButtonRight}
+\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonScrollBack}
+\newcommand{\ActionRecNext}{\ButtonScrollFwd}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index e1981b152d..fed9a38902 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -104,5 +104,7 @@
\newcommand{\ActionRecExit}{\ButtonMenu}
\newcommand{\ActionRecMenu}{Long \ButtonSelect}
\newcommand{\ActionRecNewfile}{Long \ButtonPlay}
-\newcommand{\ActionRecSettingsInc}{\ActionSettingInc}
-\newcommand{\ActionRecSettingsDec}{\ActionSettingDec} \ No newline at end of file
+\newcommand{\ActionRecSettingsInc}{\ButtonRight}
+\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonScrollBack}
+\newcommand{\ActionRecNext}{\ButtonScrollFwd}
diff --git a/manual/platform/m5.tex b/manual/platform/m5.tex
index c940cf8100..8bed4c97b7 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/m5.tex
@@ -95,5 +95,7 @@
\newcommand{\ActionRecNewfile}{\ButtonRec}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{Long \ButtonRec}
\newcommand{\ActionRecExit}{Long \ButtonPlay}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index a853b3a62b..70f3c54586 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -88,6 +88,8 @@
\newcommand{\ActionRecPause}{\ButtonMenu}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{Long \ButtonMenu}
\newcommand{\ActionRecExit}{\ButtonOff}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index 4e47e847a3..443f4d43a6 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -108,5 +108,7 @@
\newcommand{\ActionRecFThree}{\ButtonFThree}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{\ButtonFOne}
\newcommand{\ActionRecExit}{\ButtonOff}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 3c0bf406c7..5a904105fa 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -113,6 +113,8 @@
\newcommand{\ActionRecFThree}{\ButtonFThree}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{\ButtonFOne}
\newcommand{\ActionRecExit}{\ButtonOff}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 264efbac9b..6a13b52c36 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -95,6 +95,8 @@
\newcommand{\ActionRecNewfile}{\ButtonRec}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
+\newcommand{\ActionRecPrev}{\ButtonUp}
+\newcommand{\ActionRecNext}{\ButtonDown}
\newcommand{\ActionRecMenu}{Long \ButtonRec}
\newcommand{\ActionRecExit}{Long \ButtonPlay}