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

Remove an unneeded WPS update signal. Make the codec thread more polite about requesting buffering. Prevent more Codec failure pops when the codec was _asked_ to stop.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9674 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-04-15 09:19:49 +00:00
parent 521a359568
commit bf397b5635
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/playback.c
View file

@ -522,8 +522,9 @@ size_t codec_filebuf_callback(void *ptr, size_t size)
/* Let the disk buffer catch fill until enough data is available */ /* Let the disk buffer catch fill until enough data is available */
while (copy_n > cur_ti->available) { while (copy_n > cur_ti->available) {
queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0); if (!filling)
yield(); queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0);
sleep(1);
if (ci.stop_codec || ci.new_track) if (ci.stop_codec || ci.new_track)
return 0; return 0;
} }
@ -604,8 +605,9 @@ void* codec_request_buffer_callback(size_t *realsize, size_t reqsize)
} }
while (copy_n > cur_ti->available) { while (copy_n > cur_ti->available) {
queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0); if (!filling)
yield(); queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0);
sleep(1);
if (ci.stop_codec || ci.new_track) { if (ci.stop_codec || ci.new_track) {
*realsize = 0; *realsize = 0;
return NULL; return NULL;
@ -1927,7 +1929,6 @@ static void initiate_track_change(long direction)
{ {
playlist_end = false; playlist_end = false;
ci.new_track += direction; ci.new_track += direction;
track_changed = true;
} }
static void initiate_dir_change(long direction) static void initiate_dir_change(long direction)
@ -2101,8 +2102,12 @@ void codec_thread(void)
} }
if (audio_codec_loaded) if (audio_codec_loaded)
if (!playing && ci.stop_codec) if (ci.stop_codec)
pcmbuf_play_stop(); {
status = CODEC_OK;
if (!playing)
pcmbuf_play_stop();
}
audio_codec_loaded = false; audio_codec_loaded = false;