Crossfade: added a new option, rewrote decision logic, updated manual and menus. Translators please note that updated translations may be required for some crossfade menu items!

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

1 files changed, 5 insertions, 2 deletions

diff --git a/apps/settings.h b/apps/settings.h
index 4ab2d8945d..ffadfa9eee 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -109,13 +109,16 @@ enum
     TRIG_TYPE_NEW_FILE
 };
 
+#ifdef HAVE_CROSSFADE
 enum {
     CROSSFADE_ENABLE_OFF = 0,
+    CROSSFADE_ENABLE_AUTOSKIP,
+    CROSSFADE_ENABLE_MANSKIP,
     CROSSFADE_ENABLE_SHUFFLE,
-    CROSSFADE_ENABLE_TRACKSKIP,
-    CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP,
+    CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP,
     CROSSFADE_ENABLE_ALWAYS,
 };
+#endif
 
 enum {
     FOLDER_ADVANCE_OFF = 0,