Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcmbuf: simplify crossfade logic

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23593 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2009-11-09 19:34:01 +00:00
parent 874c911464
commit cc4d92c270
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/pcmbuf.c
View file

@ -502,9 +502,10 @@ static void start_crossfade_track_change(bool auto_skip)
void pcmbuf_start_track_change(bool auto_skip)
{
bool crossfade = false;
/* Manual track change (always crossfade or flush audio). */
if (!auto_skip)
start_crossfade_track_change(false);
crossfade = true;
/* Automatic track change w/crossfade, if not in "Track Skip Only" mode. */
else if (pcmbuf_is_crossfade_enabled() && !pcmbuf_is_crossfade_active()
@ -513,16 +514,15 @@ void pcmbuf_start_track_change(bool auto_skip)
if (global_settings.crossfade == CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP)
{
if (global_settings.playlist_shuffle)
/* shuffle mode is on, so crossfade: */
start_crossfade_track_change(true);
else
/* shuffle mode is off, so normal gapless playback */
start_gapless_track_change();
crossfade = true;
}
else
/* normal crossfade: */
start_crossfade_track_change(true);
crossfade = true;
}
if (crossfade)
/* crossfade to next track */
start_crossfade_track_change(auto_skip);
else
/* normal gapless playback. */
start_gapless_track_change();