summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2009-11-11 17:38:00 +0000
committerJeffrey Goode <jeffg7@gmail.com>2009-11-11 17:38:00 +0000
commit0212de4c8d67337ccae180d52f09c26c236b256a (patch)
tree52ac05f3124441d06dfe6d60e307143416e6c5f0 /apps
parent35202026cbe6a77adbccbd7f59f7b69dafa2f3b2 (diff)
downloadrockbox-0212de4c8d67337ccae180d52f09c26c236b256a.zip
rockbox-0212de4c8d67337ccae180d52f09c26c236b256a.tar.gz
rockbox-0212de4c8d67337ccae180d52f09c26c236b256a.tar.bz2
rockbox-0212de4c8d67337ccae180d52f09c26c236b256a.tar.xz
Add crossfade feature tag, update manual, fix crossfade WPS tag behavior
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23610 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/features.txt4
-rw-r--r--apps/gui/skin_engine/skin_tokens.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/features.txt b/apps/features.txt
index 14204df..d3e433a 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -42,6 +42,10 @@ button_light
buttonlight_brightness
#endif
+#if defined(HAVE_CROSSFADE)
+crossfade
+#endif
+
#if defined(HAVE_DIRCACHE)
dircache
#endif
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index a456bbc..d4adfa8 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,
if (intval)
*intval = global_settings.crossfade + 1;
snprintf(buf, buf_size, "%d", global_settings.crossfade);
- return buf;
#else
- return NULL;
+ snprintf(buf, buf_size, "%d", 0);
#endif
+ return buf;
case WPS_TOKEN_REPLAYGAIN:
{