diff options
Diffstat (limited to 'manual')
-rw-r--r-- | manual/appendix/config_file_options.tex | 4 | ||||
-rw-r--r-- | manual/configure_rockbox/playback_options.tex | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index d145014f86..ce95a54a0d 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex | |||
@@ -161,8 +161,8 @@ | |||
161 | & -120 to 120 & 0.1dB\\ | 161 | & -120 to 120 & 0.1dB\\ |
162 | % | 162 | % |
163 | \opt{crossfade}{ | 163 | \opt{crossfade}{ |
164 | crossfade & off, auto track skip, man track skip, shuffle, | 164 | crossfade & off, auto track change, man track skip, shuffle, |
165 | shuffle and man track skip, always | 165 | shuffle or man track skip, always |
166 | & N/A\\ | 166 | & N/A\\ |
167 | crossfade fade in delay | 167 | crossfade fade in delay |
168 | & 0 to 7 & seconds\\ | 168 | & 0 to 7 & seconds\\ |
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index 0cff2b3c37..8ac9548eaf 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex | |||
@@ -101,25 +101,25 @@ you to configure settings related to audio playback. | |||
101 | \section{Crossfade} | 101 | \section{Crossfade} |
102 | This section controls the behavior of the crossfader. The crossfader, when | 102 | This section controls the behavior of the crossfader. The crossfader, when |
103 | enabled, smoothly fades one track into the next. This can occur in two | 103 | enabled, smoothly fades one track into the next. This can occur in two |
104 | situations: an automatic track skip and a manual track skip. An automatic | 104 | situations: an automatic track change or a manual track skip. An automatic |
105 | track skip occurs at the end of the track, moving to the next track in the | 105 | track change occurs at the end of the track, moving to the next track in the |
106 | playlist without user intervention. A manual track skip occurs immediately | 106 | playlist without user intervention. A manual track skip goes to the next |
107 | when the appropriate button is pressed.\\ | 107 | track immediately when the appropriate button is pressed.\\ |
108 | 108 | ||
109 | Options for crossfade settings are: | 109 | Options for crossfade settings are: |
110 | \begin{description} | 110 | \begin{description} |
111 | \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled | 111 | \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled |
112 | and all track skips are gapless. If set to | 112 | and all track changes are gapless. If set to |
113 | \setting{Auto Track Skip Only}, crossfade occurs for automatic skips, | 113 | \setting{Automatic Track Change Only}, crossfade occurs for automatic |
114 | but not for manual skips. The next setting, | 114 | track changes, but not for manual track skips. The next setting, |
115 | \setting{Manual Track Skip Only}, is the opposite: tracks will only | 115 | \setting{Manual Track Skip Only}, is the opposite: tracks will only |
116 | crossfade when manually skipped. If set to \setting{Shuffle}, crossfade | 116 | crossfade when manually skipped. If set to \setting{Shuffle}, crossfade |
117 | is enabled for all track changes when the shuffle feature is set to | 117 | is enabled for all track changes, automatic or manual, when the shuffle |
118 | \setting{Yes}, but disabled otherwise. If set to | 118 | feature is set to \setting{Yes}, but disabled otherwise. If set to |
119 | \setting{Shuffle and Manual Track Skip} then crossfade will only be | 119 | \setting{Shuffle or Manual Track Skip} then crossfade will be active |
120 | active when shuffle is set to \setting{Yes} and the track is then | 120 | either when shuffle is set to \setting{Yes} or the track is manually |
121 | manually skipped. If set to \setting{Always}, tracks will always | 121 | skipped. If set to \setting{Always}, tracks will always crossfade into |
122 | crossfade into one another. | 122 | one another. |
123 | % | 123 | % |
124 | \item[Fade In Delay.] The ``fade in delay'' is the length of time between | 124 | \item[Fade In Delay.] The ``fade in delay'' is the length of time between |
125 | when the crossfade process begins and when the new track begins to fade | 125 | when the crossfade process begins and when the new track begins to fade |
@@ -137,10 +137,10 @@ you to configure settings related to audio playback. | |||
137 | % | 137 | % |
138 | \item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade | 138 | \item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade |
139 | out and the next song will simultaneously fade in. If set to | 139 | out and the next song will simultaneously fade in. If set to |
140 | \setting{Mix}, the ending song will continue to play as normal until | 140 | \setting{Mix}, the ending song will not fade out at all, and will |
141 | its end, while the starting song will fade in from under it. | 141 | continue to play as normal until its end with the starting song fading |
142 | \setting{Mix} mode is not | 142 | in from under it. \setting{Mix} mode is not used for manual track skips, |
143 | used for manual track skips, even if it is selected here. | 143 | even if it is selected here. |
144 | \end{description} | 144 | \end{description} |
145 | 145 | ||
146 | \note{The rules above apply except in the instance where | 146 | \note{The rules above apply except in the instance where |