From c4a87312f0861e6c4c7cc0b0f7ed054570275763 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Fri, 1 Dec 2006 13:11:19 +0000 Subject: updated pitch screen section with semitone mode and new buttonmappings patch FS#6402 by Alexander Levin git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11639 a1c6a512-1295-4272-9138-f99709370657 --- manual/platform/h10.tex | 1 + manual/platform/h10_5gb.tex | 1 + manual/platform/h1xx.tex | 5 +++-- manual/platform/h300.tex | 5 +++-- manual/platform/ipod3g.tex | 1 + manual/platform/ipod4g.tex | 1 + manual/platform/ipodcolor.tex | 1 + manual/platform/ipodmini.tex | 1 + manual/platform/ipodnano.tex | 1 + manual/platform/ipodvideo.tex | 1 + manual/platform/ondiofm.tex | 1 + manual/platform/ondiosp.tex | 1 + manual/platform/recorder.tex | 1 + manual/platform/recorderv2fm.tex | 1 + manual/platform/x5.tex | 1 + manual/rockbox_interface/wps.tex | 32 ++++++++++++++++++++------------ 16 files changed, 39 insertions(+), 16 deletions(-) diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex index fcbe4bb827..898a7c9941 100644 --- a/manual/platform/h10.tex +++ b/manual/platform/h10.tex @@ -72,6 +72,7 @@ \newcommand{\ActionKbdDown}{\ButtonScrollDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPower} \newcommand{\ActionPsIncSmall}{\ButtonScrollUp} \newcommand{\ActionPsIncBig}{Long \ButtonScrollUp} \newcommand{\ActionPsDecSmall}{\ButtonScrollDown} diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex index f7308538bf..1c3e99f228 100644 --- a/manual/platform/h10_5gb.tex +++ b/manual/platform/h10_5gb.tex @@ -72,6 +72,7 @@ \newcommand{\ActionKbdDown}{\ButtonScrollDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPower} \newcommand{\ActionPsIncSmall}{\ButtonScrollUp} \newcommand{\ActionPsIncBig}{Long \ButtonScrollUp} \newcommand{\ActionPsDecSmall}{\ButtonScrollDown} diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex index 4ecfd408da..cd13eac612 100644 --- a/manual/platform/h1xx.tex +++ b/manual/platform/h1xx.tex @@ -80,14 +80,15 @@ \newcommand{\ActionKbdDown}{\ButtonDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonMode} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} \newcommand{\ActionPsDecBig}{Long \ButtonDown} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonOn} -\newcommand{\ActionPsExit}{\ButtonOff} +\newcommand{\ActionPsReset}{\ButtonSelect} +\newcommand{\ActionPsExit}{\ButtonOn{} or \ButtonOff} %Button actions, Recording screen context \newcommand{\ActionRecPause}{\ButtonOn} diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex index 292b16888a..51db495676 100644 --- a/manual/platform/h300.tex +++ b/manual/platform/h300.tex @@ -82,14 +82,15 @@ \newcommand{\ActionKbdDown}{\ButtonDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonMode} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} \newcommand{\ActionPsDecBig}{Long \ButtonDown} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonOn} -\newcommand{\ActionPsExit}{\ButtonOff} +\newcommand{\ActionPsReset}{\ButtonSelect} +\newcommand{\ActionPsExit}{\ButtonOn{} or \ButtonOff} %Button actions, Recording screen context \newcommand{\ActionRecPause}{\ButtonOn} diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex index f450aabcff..973bbffa25 100644 --- a/manual/platform/ipod3g.tex +++ b/manual/platform/ipod3g.tex @@ -68,6 +68,7 @@ %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex index fcfa71dccd..79dd1499b8 100644 --- a/manual/platform/ipod4g.tex +++ b/manual/platform/ipod4g.tex @@ -68,6 +68,7 @@ %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex index 97148be01e..e4f4dd221d 100644 --- a/manual/platform/ipodcolor.tex +++ b/manual/platform/ipodcolor.tex @@ -68,6 +68,7 @@ \newcommand{\ActionKbdDown}{\ButtonScrollFwd} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex index ede347fe03..d77e186688 100644 --- a/manual/platform/ipodmini.tex +++ b/manual/platform/ipodmini.tex @@ -67,6 +67,7 @@ \newcommand{\ActionKbdDown}{\ButtonScrollFwd} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex index 546f5a0e2e..069f766fd5 100644 --- a/manual/platform/ipodnano.tex +++ b/manual/platform/ipodnano.tex @@ -69,6 +69,7 @@ %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex index 3e57206290..915a2a03db 100644 --- a/manual/platform/ipodvideo.tex +++ b/manual/platform/ipodvideo.tex @@ -69,6 +69,7 @@ %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonPlay} \newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} \newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonScrollBack} diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex index 1eb425ca7a..17e9bebbbd 100644 --- a/manual/platform/ondiofm.tex +++ b/manual/platform/ondiofm.tex @@ -55,6 +55,7 @@ \newcommand{\ActionYesNoAccept}{\ButtonRight} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{Long \ButtonMenu} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex index d626390f15..c208394456 100644 --- a/manual/platform/ondiosp.tex +++ b/manual/platform/ondiosp.tex @@ -52,6 +52,7 @@ \newcommand{\ActionYesNoAccept}{\ButtonRight} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{Long \ButtonMenu} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex index 4c575312be..93f59d1c46 100644 --- a/manual/platform/recorder.tex +++ b/manual/platform/recorder.tex @@ -75,6 +75,7 @@ \newcommand{\ActionKbdDown}{\ButtonDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonFOne} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex index b706c8d69b..caf8411a75 100644 --- a/manual/platform/recorderv2fm.tex +++ b/manual/platform/recorderv2fm.tex @@ -75,6 +75,7 @@ \newcommand{\ActionKbdDown}{\ButtonDown} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonFOne} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex index 777b0a9cc6..cd5db457df 100644 --- a/manual/platform/x5.tex +++ b/manual/platform/x5.tex @@ -71,6 +71,7 @@ \newcommand{\ActionKbdAbort}{\ButtonRec} %Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonSelect} \newcommand{\ActionPsIncSmall}{\ButtonUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp} \newcommand{\ActionPsDecSmall}{\ButtonDown} diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index a34d4a9f9f..ac9dffdcbf 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex @@ -57,7 +57,7 @@ your WPS (While Playing Screen). \begin{table} \begin{btnmap}{}{} - \ActionWpsVolUp/\ActionWpsVolDown & Volume up/down.\\ + \ActionWpsVolUp{} / \ActionWpsVolDown & Volume up/down.\\ % \ActionWpsSkipPrev & Go to beginning of track, or if pressed while in the first seconds of a track, go to previous track.\\ @@ -79,7 +79,7 @@ your WPS (While Playing Screen). \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD}{% \ActionWpsPitchScreen & Show pitch setting screen.\\}% % - \opt{ONDIO_PAD}{\ActionWpsContext\ twice}% + \opt{ONDIO_PAD}{\ActionWpsContext{} twice}% \nopt{ONDIO_PAD}{\ActionWpsMenu}% & Enter \setting{Main Menu}% \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\% @@ -186,24 +186,32 @@ function in the \setting{File Context Menu}. \nopt{player}{ \subsubsection{\label{sec:pitchscreen}Pitch} - The Pitch Screen allows you to quickly change the pitch of your \dap. The - pitch value can be adjusted between 50\% and 200\%. + + The Pitch Screen allows you to change the pitch and (at the same + time) the playback speed of your \dap. The pitch value can be + adjusted between 50\% and 200\%. Changing the pitch can be done in + two modes: procentual and semitone. + \begin{table} \begin{btnmap}{}{} - \ActionPsIncSmall/\ActionPsDecSmall - & Increase / Decrease Pitch by 0.1\% \\ + \ActionPsToggleMode + & Toggle pitch changing mode \\ + % + \ActionPsIncSmall{} / \ActionPsDecSmall + & Increase / Decrease pitch by 0.1\% (in procentual mode) or a semitone + (in semitone mode)\\ % - \ActionPsIncBig/\ActionPsDecBig - & Increase / Decrease Pitch by 1\% \\ + \ActionPsIncBig{} / \ActionPsDecBig + & Increase / Decrease pitch by 1\% (only in procentual mode)\\ % - \ActionPsNudgeRight/\ActionPsNudgeLeft - & Temporarily Increase / Decrease Pitch by 2.0\% \\ + \ActionPsNudgeRight{} / \ActionPsNudgeLeft + & Temporarily Increase / Decrease pitch by 2.0\% \\ % \ActionPsReset - & Reset Pitch to 100\% \\ + & Reset pitch to 100\% \\ % \ActionPsExit - & Leave Pitch screen \\ + & Leave the Pitch Screen \\ % \end{btnmap} \end{table} -- cgit