From beaef8d7b0726ae994606c0e89d0053c2eb73664 Mon Sep 17 00:00:00 2001 From: Buschel Date: Wed, 14 Apr 2010 19:44:07 +0000 Subject: [PATCH] Consistent use of Hz, kHz, dB, dbFS, ms, s and min. Add spaces between number and unit -- e.g. '5 dB'. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25648 a1c6a512-1295-4272-9138-f99709370657 --- manual/appendix/appendix.tex | 2 +- manual/appendix/config_file_options.tex | 28 ++++++++--------- manual/appendix/wps_tags.tex | 2 +- manual/configure_rockbox/display_options.tex | 13 ++++---- manual/configure_rockbox/playback_options.tex | 2 +- manual/configure_rockbox/recording_settings.tex | 40 ++++++++++++------------- manual/configure_rockbox/sound_settings.tex | 14 ++++----- manual/plugins/mpegplayer.tex | 2 +- manual/rockbox_interface/wps.tex | 6 ++-- 9 files changed, 55 insertions(+), 54 deletions(-) diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex index 2130a0eca..99bc626cf 100644 --- a/manual/appendix/appendix.tex +++ b/manual/appendix/appendix.tex @@ -73,7 +73,7 @@ The recording hardware (the MAS) does not allow us to do this The mp3{}-decoding hardware cannot decode OGG. It can be reprogrammed, but there is too little memory for OGG and we have no documentation on how to program the MAS' DSP. Doing the conversion with the CPU is impossible, since - a 12MHz SH1 is far too slow for this daunting task. + a 12 MHz SH1 is far too slow for this daunting task. \item Archos Multimedia support.\\ The Archos Multimedia is a completely different beast. It is an entirely different architecture, different CPU and upgrading the software is done diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index aa3cd168b..17e9cb79b 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -158,7 +158,7 @@ replaygain noclip & on, off & N/A\\ replaygain preamp - & -120 to 120 & 0.1dB\\ + & -120 to 120 & 0.1 dB\\ % \opt{crossfade}{ crossfade & off, auto track change, man track skip, shuffle, @@ -178,16 +178,16 @@ % crossfeed & on, off & N/A\\ crossfeed direct gain - & 0 to 60 & 0.1dB\\ + & 0 to 60 & 0.1 dB\\ crossfeed cross gain - & 30 to 120 & 0.1dB\\ + & 30 to 120 & 0.1 dB\\ crossfeed hf attenuation - & 60 to 240 & 0.1dB\\ + & 60 to 240 & 0.1 dB\\ crossfeed hf cutoff & 500 to 2000 & Hz\\ % eq enabled & on, off & N/A\\ - eq precut & 0 to 240 & 0.1dB\\ + eq precut & 0 to 240 & 0.1 dB\\ eq band 0 cutoff & 0 to 32768 & Hz\\ eq band 1 cutoff & 0 to 32768 & Hz\\ eq band 2 cutoff & 0 to 32768 & Hz\\ @@ -198,11 +198,11 @@ eq band 2 q & 0 to 64 & N/A\\ eq band 3 q & 0 to 64 & N/A\\ eq band 4 q & 0 to 64 & N/A\\ - eq band 0 gain & -240 to 240 & 0.1dB\\ - eq band 1 gain & -240 to 240 & 0.1dB\\ - eq band 2 gain & -240 to 240 & 0.1dB\\ - eq band 3 gain & -240 to 240 & 0.1dB\\ - eq band 4 gain & -240 to 240 & 0.1dB\\ + eq band 0 gain & -240 to 240 & 0.1 dB\\ + eq band 1 gain & -240 to 240 & 0.1 dB\\ + eq band 2 gain & -240 to 240 & 0.1 dB\\ + eq band 3 gain & -240 to 240 & 0.1 dB\\ + eq band 4 gain & -240 to 240 & 0.1 dB\\ % dithering enabled & on, off & N/A\\ % @@ -226,7 +226,7 @@ \opt{masf}{ loudness & 0 to 17 & N/A\\ superbass & on, off & N/A\\ - auto volume & off, 20ms, 2s, 4s, 8s + auto volume & off, 20 ms, 2 s, 4 s, 8 s & seconds\\ mdb enable & on,off & N/A\\ mdb strength & 0 to 127 & dB\\ @@ -238,10 +238,10 @@ \opt{lcd_bitmap}{ peak meter release & 1 to 126 & ?\\ - peak meter hold + peak meter hold & off, 200ms, 300ms, 500ms, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 30, 1min & N/A \\ - peak meter clip hold + peak meter clip hold & on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 45, 60, 90, 2min, 3min, 5min, 10min, 20min, 45min, 90min & N/A \\ @@ -357,7 +357,7 @@ jump scroll & 0 to 5 & N/A\\ jump scroll delay - & 0 to 250 & 0.01s\\ + & 0 to 250 & 0.01 s\\ }% \bottomrule diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index 155de3699..a35c97320 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex @@ -87,7 +87,7 @@ show the information for the next song to be played. Ogg Vorbis (OGG), FLAC, MPC, AC3, WavPack (WV), ALAC, AAC, Shorten (SHN), SID, ADX, NSF, Speex, SPC, APE, WMA, MOD, SAP.\\ \config{\%ff} & File Frequency (in Hz)\\ - \config{\%fk} & File Frequency (in KHz)\\ + \config{\%fk} & File Frequency (in kHz)\\ \config{\%fm} & File Name\\ \config{\%fn} & File Name (without extension)\\ \config{\%fp} & File Path\\ diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex index 23673e248..b4b6b662a 100644 --- a/manual/configure_rockbox/display_options.tex +++ b/manual/configure_rockbox/display_options.tex @@ -32,14 +32,15 @@ \item[Backlight Fade In.] The amount of time that the backlight will take to fade from off to on after a button is pressed. If set to \setting{Off} the backlight will - turn on immediately, with no fade in. Can also be set to \setting{500ms}, - \setting{1s} or \setting{2s}. + turn on immediately, with no fade in. Can also be set to + \setting{500 ms}, \setting{1 s} or \setting{2 s}. \item[Backlight Fade Out.] Like Backlight fade in, this controls the amount of time that the backlight will take to fade from on to off after a button is pressed. If set to \setting{Off} the backlight will turn off immediately, with no - fade out. Other valid values: \setting{500ms}, \setting{1s}, - \setting{2s}, \setting{3s}, \setting{4s}, \setting{5s} or \setting{10s}. + fade out. Other valid values: \setting{500 ms}, \setting{1 s}, + \setting{2 s}, \setting{3 s}, \setting{4 s}, \setting{5 s} or + \setting{10 s}. } \opt{backlight_fade_bool}{ \item[Backlight Fade In.] @@ -199,10 +200,10 @@ \item[Peak Release.] This determines how fast the bar shrinks when the music becomes softer. Lower values make the peak meter look smoother. - Expressed in scale units per 10ms. + Expressed in scale units per 10 ms. \item[Peak Hold Time.] Specifies the time after which the peak indicator will reset. - For example, if you set this value to 5s, the peak indicator displays + For example, if you set this value to 5 s, the peak indicator displays the loudest volume value that occurred within the last 5 seconds. Larger values are useful if you want to find the peak level of a song, which might be of interest when copying music from the \dap\ via the diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index b48310967..3aa22fd95 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex @@ -194,7 +194,7 @@ you to configure settings related to audio playback. much, so here you can compensate for that. Please note that a (large) positive pre-amp setting can cause clipping, unless prevent clipping is enabled. The pre-amp can be set to any - decibel (dB) value between -12dB and +12dB, in increments of 0.5dB. + decibel (dB) value between -12 dB and +12 dB, in increments of 0.5 dB. \end{description} \section{Track Skip Beep} diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex index bab9a7db7..5b2c1d2d6 100644 --- a/manual/configure_rockbox/recording_settings.tex +++ b/manual/configure_rockbox/recording_settings.tex @@ -21,10 +21,10 @@ \begin{table}[h!] \begin{rbtabular}{0.75\textwidth}{lX}% {\emph{Frequency} & \emph{Bitrate} (Kbit/s) -- quality 0$\rightarrow$7}{}{} - 44100Hz stereo & 75, 80, 90, 100, 120, 140, 160, 170 \\ - 22050Hz stereo & 39, 41, 45, 50, 60, 80, 110, 130 \\ - 44100Hz mono & 65, 68, 73, 80, 90, 105, 125, 140 \\ - 22050Hz mono & 35, 38, 40, 45, 50, 60, 75, 90 \\ + 44100 Hz stereo & 75, 80, 90, 100, 120, 140, 160, 170 \\ + 22050 Hz stereo & 39, 41, 45, 50, 60, 80, 110, 130 \\ + 44100 Hz mono & 65, 68, 73, 80, 90, 105, 125, 140 \\ + 22050 Hz mono & 35, 38, 40, 45, 50, 60, 75, 90 \\ \end{rbtabular} \end{table} } @@ -44,30 +44,30 @@ \section{Frequency} \nopt{sansa}{ Choose the recording frequency (sample rate). - \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz} - \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz} - \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz} - \opt{sansaAMS}{96kHz, 88.2kHz, 64kHz, 48kHz, 44.1kHz, 32kHz, 24kHz, % - 22.05kHz, 16kHz, 12kHz, 11.025kHz and 8kHz} - \opt{gigabeats}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz, 12kHz, % - 11.025kHz and 8kHz} + \opt{masf}{48 kHz, 44.1 kHz, 32 kHz, 24 kHz, 22.05 kHz, 16 kHz} + \opt{h100,h300}{44.1 kHz, 22.05 kHz and 11.025 kHz} + \opt{x5}{88.2 kHz, 44.1 kHz, 22.05 kHz and 11.025 kHz} + \opt{sansaAMS}{96 kHz, 88.2 kHz, 64 kHz, 48 kHz, 44.1 kHz, 32 kHz, 24 kHz, % + 22.05 kHz, 16 kHz, 12 kHz, 11.025 kHz and 8 kHz} + \opt{gigabeats}{48 kHz, 44.1 kHz, 32 kHz, 24 kHz, 22.05 kHz, 16 kHz, 12 kHz, % + 11.025 kHz and 8 kHz} are available. Higher sample rates use up more disk space, but give better sound quality. - \opt{swcodec}{\note{The 11.025kHz setting is not available when using % + \opt{swcodec}{\note{The 11.025 kHz setting is not available when using % \setting{MPEG Layer 3} format.} }% \opt{masf}{ The frequency setting also determines which version of the MPEG standard the sound is recorded using:\\ - MPEG v1 for 48, 44.1 and 32\\ - MPEG v2 for 24, 22.05 and 16\\ + MPEG v1 for 48 kHz, 44.1 kHz and 32 kHz.\\ + MPEG v2 for 24 kHz, 22.05 kHz and 16 kHz.\\ } \opt{recorder,recorderv2fm,h100} {\note{You cannot change the sample rate for digital recordings.} } } % nopt sansa \opt{sansa}{ - Recordings can only be made at a 22.05kHz frequency (sample rate) + Recordings can only be made at a 22.05 kHz frequency (sample rate) on this \dap. } % opt sansa @@ -242,25 +242,25 @@ More information can be found at \wikilink{VolumeTriggeredRecording}. automatically controlling the gain while recording. \begin{description} \item[Safety (clip).] - This preset will lower the gain when the levels get too high (-1dB) + This preset will lower the gain when the levels get too high (-1 dB) and will never increase gain. \item[Live (slow).] This preset is designed to be used for recording of live shows and has quite large headroom for loud parts. It heads for a nominal target peak - level of -9dB and will slowly increase or decrease gain to reach it. + level of -9 dB and will slowly increase or decrease gain to reach it. \item[DJ-Set (slow).] - This preset heads for a nominal target peak level of -5dB and will + This preset heads for a nominal target peak level of -5 dB and will slowly increase or decrease gain to reach it. \item[Medium.] - This preset heads for a nominal target peak level of -6dB and will + This preset heads for a nominal target peak level of -6 dB and will increase or decrease gain to reach it. \item[Voice (fast).] This preset is designed to be used for voice recording and heads for a - nominal target peak level of -7dB and will quickly increase or + nominal target peak level of -7 dB and will quickly increase or decrease gain to reach it. \end{description} diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex index bbfbd5b97..13577b2db 100644 --- a/manual/configure_rockbox/sound_settings.tex +++ b/manual/configure_rockbox/sound_settings.tex @@ -24,7 +24,7 @@ change to customise your listening experience. \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}% \opt{ipodvideo}{minimum of -89 dB to a maximum of +6 dB.}% \opt{ipodnano2g,ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of - -74 dB to a maximum of +6 db.}% + -74 dB to a maximum of +6 dB.}% \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}% \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}% \opt{ipodvideo}{\\Remark: Lowering the volume below -57 dB will also affect the line-out @@ -138,7 +138,7 @@ change to customise your listening experience. Auto volume is a feature that automatically lowers the volume on loud parts, and then slowly restores the volume to the previous level over a time interval. This setting allows this time interval to be configured. Short - values like 20ms are useful for ensuring a constant volume for in-car use and + values like 20 ms are useful for ensuring a constant volume for in-car use and other applications where background noise makes a constant loudness desirable. A longer timeout means that the change in volume back to the previous level will be smoother, so there will be fewer sharp changes in volume level. @@ -149,7 +149,7 @@ change to customise your listening experience. This setting changes the threshold at which bass frequencies are affected by the \setting{Loudness} setting, making the sound of drums and bass guitar louder in comparison to the rest of the sound. This setting only has an - effect if \setting{Loudness} is set to a value larger than 0dB. + effect if \setting{Loudness} is set to a value larger than 0 dB. } \opt{masf}{ @@ -199,10 +199,10 @@ change to customise your listening experience. % \begin{table}[h!] \begin{rbtabular}{0.5\textwidth}{Xc}{Setting & Value}{}{} - MDB Strength & 50dB \\ + MDB Strength & 50 dB \\ MDB Harmonics & 48\% \\ - MDB Centre Frequency & 60Hz \\ - MDB Shape & 90Hz \\ + MDB Centre Frequency & 60 Hz \\ + MDB Shape & 90 Hz \\ \end{rbtabular} \end{table} @@ -496,5 +496,5 @@ compressed. Once the compressor determines that compression is necessary, the input signal is reduced appropriately, but the gain isn't allowed to immediately return to normal levels. This is necessary to reduce artifacts such as "pumping." Instead, the gain is allowed to return to normal at the -chosen rate. Release Time is the time for the gain to recover by 10dB. +chosen rate. Release Time is the time for the gain to recover by 10 dB. } diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex index 3ae54424d..5e92df5ca 100644 --- a/manual/plugins/mpegplayer.tex +++ b/manual/plugins/mpegplayer.tex @@ -81,7 +81,7 @@ Display Options Menu video is full-screen this means it will get overwritten by the video and appear to flash once per second) the average number of frames decoded per second, the total number of frames skipped (see the Skip Frames option), - the current time (in 100Hz ticks) and the time the current frame is due to + the current time (in 100 Hz ticks) and the time the current frame is due to be displayed. \item[Limit FPS] (default: on) With this option disabled, mpegplayer will display the video as fast as it can. Useful for benchmarking. diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index 5930193cd..0466e6e00 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex @@ -202,9 +202,9 @@ your WPS (While Playing Screen). \item [The scale:] Between the indicators of the right and left channel there are little dots. These dots represent important volume values. In linear mode each dot is a - 10\% mark. In dbfs mode the dots represent the following values (from right - to left): 0db, {}-3db, {}-6db, {}-9db, {}-12db, {}-18db, {}-24db, {}-30db, - {}-40db, {}-50db, {}-60db. + 10\% mark. In dBFS mode the dots represent the following values (from right + to left): 0 dB, {}-3 dB, {}-6 dB, {}-9 dB, {}-12 dB, {}-18 dB, {}-24 dB, {}-30 dB, + {}-40 dB, {}-50 dB, {}-60 dB. \end{description} } \subsection{\label{sec:contextmenu}The WPS Context Menu} -- 2.11.4.GIT