forked from len0rd/rockbox
Fixed: Crossfading, broken elapsed info with mp3 files, possible cpu
boost problem and track changing. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7027 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
2d79df5086
commit
d6e7942426
4 changed files with 21 additions and 15 deletions
|
@ -119,11 +119,11 @@ enum codec_status codec_start(struct codec_api* api)
|
|||
first_frame = false;
|
||||
file_end = 0;
|
||||
OutputPtr = OutputBuffer;
|
||||
frequency_divider = ci->id3->frequency / 100;
|
||||
|
||||
while (!*ci->taginfo_ready)
|
||||
ci->yield();
|
||||
|
||||
frequency_divider = ci->id3->frequency / 100;
|
||||
ci->configure(DSP_SET_FREQUENCY, (int *)ci->id3->frequency);
|
||||
|
||||
ci->request_buffer(&size, ci->id3->first_frame_offset);
|
||||
|
|
|
@ -1236,16 +1236,19 @@ bool codec_request_next_track_callback(void)
|
|||
|
||||
/* Advance to next track. */
|
||||
if (ci.reload_codec && new_track > 0) {
|
||||
/* Wait for new track data. */
|
||||
while (track_ridx == track_widx && filling)
|
||||
yield();
|
||||
|
||||
if (!playlist_check(1))
|
||||
return false;
|
||||
last_peek_offset--;
|
||||
playlist_next(1);
|
||||
if (++track_ridx == MAX_TRACK)
|
||||
track_ridx = 0;
|
||||
|
||||
/* Wait for new track data (codectype 0 is invalid). When a correct
|
||||
codectype is set, we can assume that the filesize is correct. */
|
||||
while (tracks[track_ridx].id3.codectype == 0 && filling
|
||||
&& !ci.stop_codec)
|
||||
yield();
|
||||
|
||||
if (tracks[track_ridx].filesize == 0) {
|
||||
logf("Loading from disk...");
|
||||
new_track = 0;
|
||||
|
@ -1274,10 +1277,6 @@ bool codec_request_next_track_callback(void)
|
|||
|
||||
/* Codec requested track change (next track). */
|
||||
else {
|
||||
/* Wait for new track data. */
|
||||
while (track_ridx == track_widx && filling)
|
||||
yield();
|
||||
|
||||
if (!playlist_check(1))
|
||||
return false;
|
||||
last_peek_offset--;
|
||||
|
@ -1285,7 +1284,13 @@ bool codec_request_next_track_callback(void)
|
|||
if (++track_ridx >= MAX_TRACK)
|
||||
track_ridx = 0;
|
||||
|
||||
if (track_ridx == track_widx && tracks[track_ridx].filerem == 0) {
|
||||
/* Wait for new track data (codectype 0 is invalid). When a correct
|
||||
codectype is set, we can assume that the filesize is correct. */
|
||||
while (tracks[track_ridx].id3.codectype == 0 && filling
|
||||
&& !ci.stop_codec)
|
||||
yield();
|
||||
|
||||
if (tracks[track_ridx].filesize == 0) {
|
||||
logf("No more tracks");
|
||||
new_track = 0;
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue