diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
| commit | 90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0 (patch) | |
| tree | ac53454c122465d174ec6a47a56e72505d7b09b8 /apps/settings.c | |
| parent | 4f6375ca175b34623e5c737cd36dbd62aad58fd2 (diff) | |
| download | rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.zip rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.gz rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.bz2 rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.xz | |
It's now possible to select the crossfading mode: "Off, Crossfade,
Mix". If set to mix, no fading is applied but tracks are mixed up.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7224 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c index d374f00..efb9cfd 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -397,7 +397,7 @@ static const struct bit_entry hd_bits[] = #endif #if CONFIG_HWCODEC == MASNONE - {3, S_O(crossfade), 0, "crossfade", "off,2s,4s,6s,8s,10s,12s,14s"}, + {3, S_O(crossfade_duration), 0, "crossfade duration", "1s,2s,4s,6s,8s,10s,12s,14s"}, #endif #if CONFIG_BACKLIGHT == BL_IRIVER @@ -414,6 +414,10 @@ static const struct bit_entry hd_bits[] = {1, S_O(next_folder), false, "move to next folder", off_on }, {1, S_O(runtimedb), false, "gather runtime data", off_on }, +#if CONFIG_HWCODEC == MASNONE + {2, S_O(crossfade), 0, "crossfade type", "off,crossfade,mix"}, +#endif + /* new stuff to be added at the end */ /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ @@ -851,7 +855,7 @@ void settings_apply(void) } #if CONFIG_HWCODEC == MASNONE - audio_set_crossfade_amount(global_settings.crossfade); + audio_set_crossfade(global_settings.crossfade); #endif #ifdef HAVE_SPDIF_POWER |