summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-08-15 18:11:11 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-08-15 18:11:11 +0000
commit0a3b551c429b10b93d9474ceb35f6f281f475cbe (patch)
treecc73cba3b0ed987f6ab17936799c57d4d988ff5e
parent42f0ad3c8f11a699f4ce7d500b91e195e1a619e3 (diff)
downloadrockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.zip
rockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.tar.gz
rockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.tar.bz2
rockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.tar.xz
Oops, only software codec platforms can do crossfade
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10591 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_menu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 4484115..5f84dc1 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1266,7 +1266,9 @@ static bool voice_dirs(void)
{
bool ret = set_option( str(LANG_VOICE_DIR),
&global_settings.talk_dir, INT, voice_names, 4, NULL);
+#if CONFIG_CODEC == SWCODEC
audio_set_crossfade(global_settings.crossfade);
+#endif
return ret;
}
@@ -1277,7 +1279,9 @@ static bool voice_files(void)
ret = set_option( str(LANG_VOICE_FILE),
&global_settings.talk_file, INT, voice_names, 4, NULL);
+#if CONFIG_CODEC == SWCODEC
audio_set_crossfade(global_settings.crossfade);
+#endif
if (oldval != 3 && global_settings.talk_file == 3)
{ /* force reload if newly talking thumbnails,
because the clip presence is cached only if enabled */