devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Always use crossfade if it's enabled.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6933 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-06-29 21:13:46 +00:00
parent 848be81828
commit 7b7d1e6802
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/playback.c
View file

@ -986,7 +986,9 @@ void audio_update_trackinfo(void)
if (buf_ridx >= codecbuflen) if (buf_ridx >= codecbuflen)
buf_ridx -= codecbuflen; buf_ridx -= codecbuflen;
pcm_crossfade_init(); if (!pcm_crossfade_init())
pcm_flush_audio();
if (!filling) if (!filling)
pcm_set_boost_mode(false); pcm_set_boost_mode(false);
} else { } else {
@ -1140,7 +1142,8 @@ void audio_thread(void)
ci.stop_codec = true; ci.stop_codec = true;
ci.reload_codec = false; ci.reload_codec = false;
ci.seek_time = 0; ci.seek_time = 0;
pcm_flush_audio(); if (!pcm_crossfade_init())
pcm_flush_audio();
audio_play_start((int)ev.data); audio_play_start((int)ev.data);
break ; break ;
@ -1349,7 +1352,7 @@ static void initiate_track_change(int peek_index)
} }
else if (!pcm_crossfade_init()) { else if (!pcm_crossfade_init()) {
//pcm_play_stop(); pcm_flush_audio();
} }
} }

1
firmware/export/pcm_playback.h
View file

@ -46,6 +46,7 @@ void pcm_play_set_watermark(int numbytes, void (*callback)(int bytes_left));
void pcm_set_boost_mode(bool state); void pcm_set_boost_mode(bool state);
bool pcm_is_lowdata(void); bool pcm_is_lowdata(void);
void pcm_flush_audio(void);
void pcm_flush_buffer(long length); void pcm_flush_buffer(long length);
bool pcm_crossfade_init(void); bool pcm_crossfade_init(void);
void audiobuffer_add_event(void (*event_handler)(void)); void audiobuffer_add_event(void (*event_handler)(void));