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

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23621 a1c6a512-1295-4272-9138-f99709370657

apps/lang/bulgarian.lang

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

apps/lang/catala.lang

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

apps/lang/chinese-simp.lang

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

apps/lang/chinese-trad.lang

@@ -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>

apps/lang/czech.lang

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

apps/lang/dansk.lang

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

apps/lang/deutsch.lang

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

apps/lang/english.lang

@@ -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>

apps/lang/espanol.lang

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

apps/lang/finnish.lang

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

apps/lang/francais.lang

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

apps/lang/greek.lang

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

apps/lang/hebrew.lang

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

apps/lang/italiano.lang

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

apps/lang/japanese.lang

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

apps/lang/korean.lang

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

apps/lang/lietuviu.lang

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

apps/lang/magyar.lang

@@ -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>

apps/lang/nederlands.lang

@@ -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>

apps/lang/norsk-nynorsk.lang

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

apps/lang/norsk.lang

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

apps/lang/polski.lang

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

apps/lang/portugues-brasileiro.lang

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

apps/lang/portugues.lang

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

apps/lang/romaneste.lang

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

apps/lang/russian.lang

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

apps/lang/srpski.lang

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

apps/lang/svenska.lang

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

apps/lang/tagalog.lang

@@ -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>

apps/lang/thai.lang

@@ -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>

apps/lang/ukrainian.lang

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

apps/lang/walon.lang

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

apps/pcmbuf.c

@@ -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:
+            case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP:
-                crossfade = global_settings.playlist_shuffle && !auto_skip;
+                crossfade = global_settings.playlist_shuffle || !auto_skip;
                 break;
             case CROSSFADE_ENABLE_ALWAYS:
                 crossfade = true;

apps/settings.h

@@ -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

apps/settings_list.c

@@ -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)),

manual/appendix/config_file_options.tex

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

manual/configure_rockbox/playback_options.tex

@@ -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
+    situations: an automatic track change or a manual track skip.  An automatic
-    track skip occurs at the end of the track, moving to the next track in the
+    track change occurs at the end of the track, moving to the next track in the
-    playlist without user intervention.  A manual track skip occurs immediately
+    playlist without user intervention.  A manual track skip goes to the next
-    when the appropriate button is pressed.\\
+    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
+        and all track changes are gapless.  If set to
-        \setting{Auto Track Skip Only}, crossfade occurs for automatic skips,
+        \setting{Automatic Track Change Only}, crossfade occurs for automatic
-        but not for manual skips.  The next setting,
+        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
+        is enabled for all track changes, automatic or manual, when the shuffle
-        \setting{Yes}, but disabled otherwise.  If set to
+        feature is set to \setting{Yes}, but disabled otherwise.  If set to
-        \setting{Shuffle and Manual Track Skip} then crossfade will only be
+        \setting{Shuffle or Manual Track Skip} then crossfade will be active
-        active when shuffle is set to \setting{Yes} and the track is then
+        either when shuffle is set to \setting{Yes} or the track is manually
-        manually skipped.  If set to \setting{Always}, tracks will always
+        skipped.  If set to \setting{Always}, tracks will always crossfade into
-        crossfade into one another.
+        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 
+        \setting{Mix}, the ending song will not fade out at all, and will
-        its end, while the starting song will fade in from under it. 
+        continue to play as normal until its end with the starting song fading
-        \setting{Mix} mode is not
+        in from under it. \setting{Mix} mode is not used for manual track skips,
-        used for manual track skips, even if it is selected here.
+        even if it is selected here.
       \end{description}
       
       \note{The rules above apply except in the instance where