diff options
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 4 | ||||
-rw-r--r-- | manual/appendix/config_file_options.tex | 16 | ||||
-rw-r--r-- | manual/appendix/wps_tags.tex | 3 | ||||
-rw-r--r-- | manual/configure_rockbox/playback_options.tex | 19 |
5 files changed, 35 insertions, 11 deletions
diff --git a/apps/features.txt b/apps/features.txt index 14204dfb6d..d3e433ad45 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -42,6 +42,10 @@ button_light | |||
42 | buttonlight_brightness | 42 | buttonlight_brightness |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | #if defined(HAVE_CROSSFADE) | ||
46 | crossfade | ||
47 | #endif | ||
48 | |||
45 | #if defined(HAVE_DIRCACHE) | 49 | #if defined(HAVE_DIRCACHE) |
46 | dircache | 50 | dircache |
47 | #endif | 51 | #endif |
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index a456bbca23..d4adfa8c85 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -770,10 +770,10 @@ const char *get_token_value(struct gui_wps *gwps, | |||
770 | if (intval) | 770 | if (intval) |
771 | *intval = global_settings.crossfade + 1; | 771 | *intval = global_settings.crossfade + 1; |
772 | snprintf(buf, buf_size, "%d", global_settings.crossfade); | 772 | snprintf(buf, buf_size, "%d", global_settings.crossfade); |
773 | return buf; | ||
774 | #else | 773 | #else |
775 | return NULL; | 774 | snprintf(buf, buf_size, "%d", 0); |
776 | #endif | 775 | #endif |
776 | return buf; | ||
777 | 777 | ||
778 | case WPS_TOKEN_REPLAYGAIN: | 778 | case WPS_TOKEN_REPLAYGAIN: |
779 | { | 779 | { |
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index 43f6aea203..d145014f86 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex | |||
@@ -160,7 +160,9 @@ | |||
160 | replaygain preamp | 160 | replaygain preamp |
161 | & -120 to 120 & 0.1dB\\ | 161 | & -120 to 120 & 0.1dB\\ |
162 | % | 162 | % |
163 | crossfade & off, shuffle, track skip, always | 163 | \opt{crossfade}{ |
164 | crossfade & off, auto track skip, man track skip, shuffle, | ||
165 | shuffle and man track skip, always | ||
164 | & N/A\\ | 166 | & N/A\\ |
165 | crossfade fade in delay | 167 | crossfade fade in delay |
166 | & 0 to 7 & seconds\\ | 168 | & 0 to 7 & seconds\\ |
@@ -172,6 +174,7 @@ | |||
172 | & 0 to 15 & seconds\\ | 174 | & 0 to 15 & seconds\\ |
173 | crossfade fade out mode | 175 | crossfade fade out mode |
174 | & crossfade, mix & N/A\\ | 176 | & crossfade, mix & N/A\\ |
177 | } | ||
175 | % | 178 | % |
176 | crossfeed & on, off & N/A\\ | 179 | crossfeed & on, off & N/A\\ |
177 | crossfeed direct gain | 180 | crossfeed direct gain |
@@ -202,6 +205,17 @@ | |||
202 | eq band 4 gain & -240 to 240 & 0.1dB\\ | 205 | eq band 4 gain & -240 to 240 & 0.1dB\\ |
203 | % | 206 | % |
204 | dithering enabled & on, off & N/A\\ | 207 | dithering enabled & on, off & N/A\\ |
208 | % | ||
209 | timestretch enabled & on, off & N/A\\ | ||
210 | % | ||
211 | compressor threshold & 0 to -24 & -3dB\\ | ||
212 | compressor makeup gain & off, auto & N/A\\ | ||
213 | compressor ratio & 2:1, 4:1, 6:1, 10:1, limit | ||
214 | & N/A\\ | ||
215 | compressor knee & hard knee, soft knee | ||
216 | & N/A\\ | ||
217 | compressor release time & 100 to 1000 & 100 ms\\ | ||
218 | % | ||
205 | beep & off, weak, moderate, strong & N/A\\ | 219 | beep & off, weak, moderate, strong & N/A\\ |
206 | keyclick & off, weak, moderate, strong & N/A\\ | 220 | keyclick & off, weak, moderate, strong & N/A\\ |
207 | keyclick repeats & on, off & N/A\\ | 221 | keyclick repeats & on, off & N/A\\ |
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index 7c4fd5418a..a9eaf0f7d8 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex | |||
@@ -159,7 +159,8 @@ produce the information for the next file to be played. | |||
159 | \begin{tagmap}{}{} | 159 | \begin{tagmap}{}{} |
160 | \config{\%Sp} & Current playback pitch \\ | 160 | \config{\%Sp} & Current playback pitch \\ |
161 | \opt{swcodec}{ | 161 | \opt{swcodec}{ |
162 | \config{\%xf} & Crossfade setting, in the order: Off, Shuffle, Skip, Always\\ | 162 | \config{\%xf} & Crossfade setting, in the order: Off, Auto Skip, Man Skip, |
163 | Shuffle, Shuffle and Man Skip, Always\\ | ||
163 | \config{\%rg} & ReplayGain value in use (x.y dB). If used as a conditional, | 164 | \config{\%rg} & ReplayGain value in use (x.y dB). If used as a conditional, |
164 | Replaygain type in use: \config{\%?rg{\textless}Off{\textbar}Track% | 165 | Replaygain type in use: \config{\%?rg{\textless}Off{\textbar}Track% |
165 | {\textbar}Album{\textbar}TrackShuffle{\textbar}AlbumShuffle% | 166 | {\textbar}Album{\textbar}TrackShuffle{\textbar}AlbumShuffle% |
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index f9f1db01f2..0cff2b3c37 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex | |||
@@ -97,17 +97,21 @@ you to configure settings related to audio playback. | |||
97 | disabled as well as skipping songs and launching plugins. | 97 | disabled as well as skipping songs and launching plugins. |
98 | 98 | ||
99 | \opt{swcodec}{ | 99 | \opt{swcodec}{ |
100 | \opt{crossfade}{ | ||
100 | \section{Crossfade} | 101 | \section{Crossfade} |
101 | This setting enables a cross-fader. At the end of a song, the song will | 102 | This section controls the behavior of the crossfader. The crossfader, when |
102 | fade out as the next song fades in, creating a smooth transition between | 103 | enabled, smoothly fades one track into the next. This can occur in two |
103 | songs. The crossfade setting is particularly effective when the player is | 104 | situations: an automatic track skip and a manual track skip. An automatic |
104 | set on shuffle.\\ | 105 | track skip 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 | ||
107 | when the appropriate button is pressed.\\ | ||
105 | 108 | ||
106 | Options for crossfade settings are: | 109 | Options for crossfade settings are: |
107 | \begin{description} | 110 | \begin{description} |
108 | \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled. | 111 | \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled |
109 | If set to \setting{Auto Track Skip Only}, crossfade occurs for | 112 | and all track skips are gapless. If set to |
110 | automatic skips, but not for manual skips. The next setting, | 113 | \setting{Auto Track Skip Only}, crossfade occurs for automatic skips, |
114 | but not for manual skips. The next setting, | ||
111 | \setting{Manual Track Skip Only}, is the opposite: tracks will only | 115 | \setting{Manual Track Skip Only}, is the opposite: tracks will only |
112 | crossfade when manually skipped. If set to \setting{Shuffle}, crossfade | 116 | crossfade when manually skipped. If set to \setting{Shuffle}, crossfade |
113 | is enabled for all track changes when the shuffle feature is set to | 117 | is enabled for all track changes when the shuffle feature is set to |
@@ -147,6 +151,7 @@ you to configure settings related to audio playback. | |||
147 | The graphic below illustrates how the different settings work in practice. | 151 | The graphic below illustrates how the different settings work in practice. |
148 | 152 | ||
149 | \includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png} | 153 | \includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png} |
154 | }%\opt{crossfade} | ||
150 | 155 | ||
151 | \section{Replaygain} | 156 | \section{Replaygain} |
152 | This allows you to control the replaygain function. | 157 | This allows you to control the replaygain function. |