diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 18:11:11 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 18:11:11 +0000 |
commit | 0a3b551c429b10b93d9474ceb35f6f281f475cbe (patch) | |
tree | cc73cba3b0ed987f6ab17936799c57d4d988ff5e | |
parent | 42f0ad3c8f11a699f4ce7d500b91e195e1a619e3 (diff) | |
download | rockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.tar.gz rockbox-0a3b551c429b10b93d9474ceb35f6f281f475cbe.zip |
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 448411593a..5f84dc1d34 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1266,7 +1266,9 @@ static bool voice_dirs(void) | |||
1266 | { | 1266 | { |
1267 | bool ret = set_option( str(LANG_VOICE_DIR), | 1267 | bool ret = set_option( str(LANG_VOICE_DIR), |
1268 | &global_settings.talk_dir, INT, voice_names, 4, NULL); | 1268 | &global_settings.talk_dir, INT, voice_names, 4, NULL); |
1269 | #if CONFIG_CODEC == SWCODEC | ||
1269 | audio_set_crossfade(global_settings.crossfade); | 1270 | audio_set_crossfade(global_settings.crossfade); |
1271 | #endif | ||
1270 | return ret; | 1272 | return ret; |
1271 | } | 1273 | } |
1272 | 1274 | ||
@@ -1277,7 +1279,9 @@ static bool voice_files(void) | |||
1277 | 1279 | ||
1278 | ret = set_option( str(LANG_VOICE_FILE), | 1280 | ret = set_option( str(LANG_VOICE_FILE), |
1279 | &global_settings.talk_file, INT, voice_names, 4, NULL); | 1281 | &global_settings.talk_file, INT, voice_names, 4, NULL); |
1282 | #if CONFIG_CODEC == SWCODEC | ||
1280 | audio_set_crossfade(global_settings.crossfade); | 1283 | audio_set_crossfade(global_settings.crossfade); |
1284 | #endif | ||
1281 | if (oldval != 3 && global_settings.talk_file == 3) | 1285 | if (oldval != 3 && global_settings.talk_file == 3) |
1282 | { /* force reload if newly talking thumbnails, | 1286 | { /* force reload if newly talking thumbnails, |
1283 | because the clip presence is cached only if enabled */ | 1287 | because the clip presence is cached only if enabled */ |