diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 03:46:08 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2009-11-10 03:46:08 +0000 |
commit | 9e0953432a3a73cd42e77c804a4557b5337e0d0f (patch) | |
tree | 49b5a4fadb1d64e9e03228cebd78e4011fde70b1 /apps/settings.h | |
parent | 78f8667d57e13ef579c892ccc5483b8baafd2fe6 (diff) | |
download | rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.tar.gz rockbox-9e0953432a3a73cd42e77c804a4557b5337e0d0f.zip |
Crossfade: carved out crossfade related code with lots of HAVE_CORSSFADE conditionals, eliminated fade buffer on low memory targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23597 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/settings.h b/apps/settings.h index eba592aca8..4ab2d8945d 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -339,6 +339,7 @@ struct user_settings | |||
339 | #endif | 339 | #endif |
340 | 340 | ||
341 | #if CONFIG_CODEC == SWCODEC | 341 | #if CONFIG_CODEC == SWCODEC |
342 | #ifdef HAVE_CROSSFADE | ||
342 | /* Crossfade */ | 343 | /* Crossfade */ |
343 | int crossfade; /* Enable crossfade (0=off, 1=shuffle, 2=trackskip, | 344 | int crossfade; /* Enable crossfade (0=off, 1=shuffle, 2=trackskip, |
344 | 3=shuff&trackskip, 4=always) */ | 345 | 3=shuff&trackskip, 4=always) */ |
@@ -347,6 +348,7 @@ struct user_settings | |||
347 | int crossfade_fade_in_duration; /* Fade in duration (0-15s) */ | 348 | int crossfade_fade_in_duration; /* Fade in duration (0-15s) */ |
348 | int crossfade_fade_out_duration; /* Fade out duration (0-15s) */ | 349 | int crossfade_fade_out_duration; /* Fade out duration (0-15s) */ |
349 | int crossfade_fade_out_mixmode; /* Fade out mode (0=crossfade,1=mix) */ | 350 | int crossfade_fade_out_mixmode; /* Fade out mode (0=crossfade,1=mix) */ |
351 | #endif | ||
350 | 352 | ||
351 | /* Replaygain */ | 353 | /* Replaygain */ |
352 | bool replaygain_noclip; /* scale to prevent clips */ | 354 | bool replaygain_noclip; /* scale to prevent clips */ |