summaryrefslogtreecommitdiff
path: root/apps/settings.h
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2009-11-11 00:48:17 +0000
committerJeffrey Goode <jeffg7@gmail.com>2009-11-11 00:48:17 +0000
commit664dc90e714837bec83153daa13ef39769705c78 (patch)
tree99178673f1e2b40ee780adf1cdf1b2359bc8c106 /apps/settings.h
parent6db8f952dc3ea8ee315159e5de1d7bea4c9a6530 (diff)
downloadrockbox-664dc90e714837bec83153daa13ef39769705c78.zip
rockbox-664dc90e714837bec83153daa13ef39769705c78.tar.gz
rockbox-664dc90e714837bec83153daa13ef39769705c78.tar.bz2
rockbox-664dc90e714837bec83153daa13ef39769705c78.tar.xz
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
Diffstat (limited to 'apps/settings.h')
-rw-r--r--apps/settings.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/settings.h b/apps/settings.h
index 4ab2d89..ffadfa9 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,