Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Crossfade: fix shuffle OR manual skip functionality, verbiage and manual

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23621 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2009-11-12 15:42:37 +00:00
parent b8793f85a5
commit 29d2711115
37 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/lang/bulgarian.lang
View file

@ -4674,7 +4674,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/catala.lang
View file

@ -1667,7 +1667,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/chinese-simp.lang
View file

@ -9256,7 +9256,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

4
apps/lang/chinese-trad.lang
View file

@ -9235,7 +9235,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
@ -9243,7 +9243,7 @@
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>

2
apps/lang/czech.lang
View file

@ -1673,7 +1673,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/dansk.lang
View file

@ -9516,7 +9516,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/deutsch.lang
View file

@ -1690,7 +1690,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

12
apps/lang/english.lang
View file

@ -1762,15 +1762,15 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>
@ -13233,14 +13233,14 @@
user: core
<source>
*: none
crossfade: "Auto Track Skip Only"
crossfade: "Automatic Track Change Only"
</source>
<dest>
*: none
crossfade: "Auto Track Skip Only"
crossfade: "Automatic Track Change Only"
</dest>
<voice>
*: none
crossfade: "Auto Track Skip Only"
crossfade: "Automatic Track Change Only"
</voice>
</phrase>

2
apps/lang/espanol.lang
View file

@ -8911,7 +8911,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/finnish.lang
View file

@ -9673,7 +9673,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/francais.lang
View file

@ -1720,7 +1720,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/greek.lang
View file

@ -1673,7 +1673,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/hebrew.lang
View file

@ -1697,7 +1697,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/italiano.lang
View file

@ -1691,7 +1691,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/japanese.lang
View file

@ -1695,7 +1695,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/korean.lang
View file

@ -9693,7 +9693,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/lietuviu.lang
View file

@ -1759,7 +1759,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

4
apps/lang/magyar.lang
View file

@ -1669,7 +1669,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
@ -1677,7 +1677,7 @@
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>

6
apps/lang/nederlands.lang
View file

@ -9671,15 +9671,15 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>

2
apps/lang/norsk-nynorsk.lang
View file

@ -9355,7 +9355,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/norsk.lang
View file

@ -8905,7 +8905,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/polski.lang
View file

@ -1697,7 +1697,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/portugues-brasileiro.lang
View file

@ -1688,7 +1688,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/portugues.lang
View file

@ -8224,7 +8224,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/romaneste.lang
View file

@ -4930,7 +4930,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/russian.lang
View file

@ -8761,7 +8761,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/srpski.lang
View file

@ -1672,7 +1672,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/svenska.lang
View file

@ -1694,7 +1694,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

4
apps/lang/tagalog.lang
View file

@ -1671,7 +1671,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
@ -1679,7 +1679,7 @@
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>

4
apps/lang/thai.lang
View file

@ -1670,7 +1670,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none
@ -1678,7 +1678,7 @@
</dest>
<voice>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</voice>
</phrase>
<phrase>

2
apps/lang/ukrainian.lang
View file

@ -1687,7 +1687,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

2
apps/lang/walon.lang
View file

@ -1694,7 +1694,7 @@
user: core
<source>
*: none
crossfade: "Shuffle and Manual Track Skip"
crossfade: "Shuffle or Manual Track Skip"
</source>
<dest>
*: none

4
apps/pcmbuf.c
View file

@ -493,8 +493,8 @@ void pcmbuf_start_track_change(bool auto_skip)
case CROSSFADE_ENABLE_SHUFFLE:
crossfade = global_settings.playlist_shuffle;
break;
case CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP:
crossfade = global_settings.playlist_shuffle && !auto_skip;
case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP:
crossfade = global_settings.playlist_shuffle || !auto_skip;
break;
case CROSSFADE_ENABLE_ALWAYS:
crossfade = true;

2
apps/settings.h
View file

@ -115,7 +115,7 @@ enum {
CROSSFADE_ENABLE_AUTOSKIP,
CROSSFADE_ENABLE_MANSKIP,
CROSSFADE_ENABLE_SHUFFLE,
CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP,
CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP,
CROSSFADE_ENABLE_ALWAYS,
};
#endif

2
apps/settings_list.c
View file

@ -1166,7 +1166,7 @@ const struct settings_list settings[] = {
/* crossfade */
CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0,
"crossfade",
"off,auto track skip,man track skip,shuffle,shuffle and man track skip,always",
"off,auto track change,man track skip,shuffle,shuffle or man track skip,always",
NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP),
ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE),
ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)),

4
manual/appendix/config_file_options.tex
View file

@ -161,8 +161,8 @@
& -120 to 120 & 0.1dB\\
%
\opt{crossfade}{
crossfade & off, auto track skip, man track skip, shuffle,
shuffle and man track skip, always
crossfade & off, auto track change, man track skip, shuffle,
shuffle or man track skip, always
& N/A\\
crossfade fade in delay
& 0 to 7 & seconds\\

34
manual/configure_rockbox/playback_options.tex
View file

@ -101,25 +101,25 @@ you to configure settings related to audio playback.
\section{Crossfade}
This section controls the behavior of the crossfader. The crossfader, when
enabled, smoothly fades one track into the next. This can occur in two
situations: an automatic track skip and a manual track skip. An automatic
track skip occurs at the end of the track, moving to the next track in the
playlist without user intervention. A manual track skip occurs immediately
when the appropriate button is pressed.\\
situations: an automatic track change or a manual track skip. An automatic
track change occurs at the end of the track, moving to the next track in the
playlist without user intervention. A manual track skip goes to the next
track immediately when the appropriate button is pressed.\\
Options for crossfade settings are:
\begin{description}
\item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled
and all track skips are gapless. If set to
\setting{Auto Track Skip Only}, crossfade occurs for automatic skips,
but not for manual skips. The next setting,
and all track changes are gapless. If set to
\setting{Automatic Track Change Only}, crossfade occurs for automatic
track changes, but not for manual track skips. The next setting,
\setting{Manual Track Skip Only}, is the opposite: tracks will only
crossfade when manually skipped. If set to \setting{Shuffle}, crossfade
is enabled for all track changes when the shuffle feature is set to
\setting{Yes}, but disabled otherwise. If set to
\setting{Shuffle and Manual Track Skip} then crossfade will only be
active when shuffle is set to \setting{Yes} and the track is then
manually skipped. If set to \setting{Always}, tracks will always
crossfade into one another.
is enabled for all track changes, automatic or manual, when the shuffle
feature is set to \setting{Yes}, but disabled otherwise. If set to
\setting{Shuffle or Manual Track Skip} then crossfade will be active
either when shuffle is set to \setting{Yes} or the track is manually
skipped. If set to \setting{Always}, tracks will always crossfade into
one another.
%
\item[Fade In Delay.] The ``fade in delay'' is the length of time between
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.
%
\item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade
out and the next song will simultaneously fade in. If set to
\setting{Mix}, the ending song will continue to play as normal until
its end, while the starting song will fade in from under it.
\setting{Mix} mode is not
used for manual track skips, even if it is selected here.
\setting{Mix}, the ending song will not fade out at all, and will
continue to play as normal until its end with the starting song fading
in from under it. \setting{Mix} mode is not used for manual track skips,
even if it is selected here.
\end{description}
\note{The rules above apply except in the instance where